Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Side by Side Diff: ash/shelf/shelf_layout_manager.h

Issue 1998933002: Update shelf spacing in Chrome OS according to the MD specs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments & Refactor border around item implementation Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 5 #ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
6 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 6 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 // closely with ShelfLayoutManager. 60 // closely with ShelfLayoutManager.
61 class ASH_EXPORT ShelfLayoutManager 61 class ASH_EXPORT ShelfLayoutManager
62 : public ash::ShellObserver, 62 : public ash::ShellObserver,
63 public aura::client::ActivationChangeObserver, 63 public aura::client::ActivationChangeObserver,
64 public DockedWindowLayoutManagerObserver, 64 public DockedWindowLayoutManagerObserver,
65 public keyboard::KeyboardControllerObserver, 65 public keyboard::KeyboardControllerObserver,
66 public LockStateObserver, 66 public LockStateObserver,
67 public SnapToPixelLayoutManager, 67 public SnapToPixelLayoutManager,
68 public SessionStateObserver { 68 public SessionStateObserver {
69 public: 69 public:
70 // We reserve a small area on the edge of the workspace area to ensure that
71 // the resize handle at the edge of the window can be hit.
72 static const int kWorkspaceAreaVisibleInset;
73
74 // When autohidden we extend the touch hit target onto the screen so that the
75 // user can drag the shelf out.
76 static const int kWorkspaceAreaAutoHideInset;
77
78 // Size of the shelf when auto-hidden.
79 static const int kAutoHideSize;
80
81 // Inset between the inner edge of the shelf (towards centre of screen), and
82 // the shelf items, notifications, status area etc.
83 static const int kShelfItemInset;
84 70
85 explicit ShelfLayoutManager(ShelfWidget* shelf); 71 explicit ShelfLayoutManager(ShelfWidget* shelf);
86 ~ShelfLayoutManager() override; 72 ~ShelfLayoutManager() override;
87 73
88 void set_workspace_controller(WorkspaceController* controller) { 74 void set_workspace_controller(WorkspaceController* controller) {
89 workspace_controller_ = controller; 75 workspace_controller_ = controller;
90 } 76 }
91 77
92 bool updating_bounds() const { return updating_bounds_; } 78 bool updating_bounds() const { return updating_bounds_; }
93 79
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 387
402 std::unique_ptr<RootWindowControllerObserverImpl> 388 std::unique_ptr<RootWindowControllerObserverImpl>
403 root_window_controller_observer_; 389 root_window_controller_observer_;
404 390
405 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); 391 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
406 }; 392 };
407 393
408 } // namespace ash 394 } // namespace ash
409 395
410 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 396 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698