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

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: merge 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
« no previous file with comments | « ash/shelf/shelf_button.cc ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 // On mus, widget bounds management is handled by the window manager. 62 // On mus, widget bounds management is handled by the window manager.
63 class ASH_EXPORT ShelfLayoutManager 63 class ASH_EXPORT ShelfLayoutManager
64 : public ash::ShellObserver, 64 : public ash::ShellObserver,
65 public aura::client::ActivationChangeObserver, 65 public aura::client::ActivationChangeObserver,
66 public DockedWindowLayoutManagerObserver, 66 public DockedWindowLayoutManagerObserver,
67 public keyboard::KeyboardControllerObserver, 67 public keyboard::KeyboardControllerObserver,
68 public LockStateObserver, 68 public LockStateObserver,
69 public SnapToPixelLayoutManager, 69 public SnapToPixelLayoutManager,
70 public SessionStateObserver { 70 public SessionStateObserver {
71 public: 71 public:
72 // We reserve a small area on the edge of the workspace area to ensure that
73 // the resize handle at the edge of the window can be hit.
74 static const int kWorkspaceAreaVisibleInset;
75
76 // When autohidden we extend the touch hit target onto the screen so that the
77 // user can drag the shelf out.
78 static const int kWorkspaceAreaAutoHideInset;
79
80 // Size of the shelf when auto-hidden.
81 static const int kAutoHideSize;
82
83 // Inset between the inner edge of the shelf (towards centre of screen), and
84 // the shelf items, notifications, status area etc.
85 static const int kShelfItemInset;
86 72
87 explicit ShelfLayoutManager(ShelfWidget* shelf_widget); 73 explicit ShelfLayoutManager(ShelfWidget* shelf_widget);
88 ~ShelfLayoutManager() override; 74 ~ShelfLayoutManager() override;
89 75
90 void set_workspace_controller(WorkspaceController* controller) { 76 void set_workspace_controller(WorkspaceController* controller) {
91 workspace_controller_ = controller; 77 workspace_controller_ = controller;
92 } 78 }
93 79
94 bool updating_bounds() const { return updating_bounds_; } 80 bool updating_bounds() const { return updating_bounds_; }
95 81
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 391
406 std::unique_ptr<RootWindowControllerObserverImpl> 392 std::unique_ptr<RootWindowControllerObserverImpl>
407 root_window_controller_observer_; 393 root_window_controller_observer_;
408 394
409 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager); 395 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
410 }; 396 };
411 397
412 } // namespace ash 398 } // namespace ash
413 399
414 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_ 400 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_button.cc ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698