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

Unified 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: Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: ash/shelf/shelf_layout_manager.h
diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
index 505a65bf424d5ed77bf1e90c46af5488e0ab484a..8cadb3caee8600f8cdf9f33db788905b3cff1ab7 100644
--- a/ash/shelf/shelf_layout_manager.h
+++ b/ash/shelf/shelf_layout_manager.h
@@ -67,20 +67,11 @@ class ASH_EXPORT ShelfLayoutManager
public SnapToPixelLayoutManager,
public SessionStateObserver {
public:
- // We reserve a small area on the edge of the workspace area to ensure that
- // the resize handle at the edge of the window can be hit.
- static const int kWorkspaceAreaVisibleInset;
-
- // When autohidden we extend the touch hit target onto the screen so that the
- // user can drag the shelf out.
- static const int kWorkspaceAreaAutoHideInset;
-
- // Size of the shelf when auto-hidden.
- static const int kAutoHideSize;
-
- // Inset between the inner edge of the shelf (towards centre of screen), and
- // the shelf items, notifications, status area etc.
- static const int kShelfItemInset;
+ enum ShelfItemInset {
+ // Inset between the inner edge of the shelf (towards centre of screen), and
+ // the shelf items, notifications, status area etc.
+ SHELF_ITEM_INSET,
bruthig 2016/05/25 20:24:52 Can this be moved to the ShelfLayoutConstants enum
+ };
explicit ShelfLayoutManager(ShelfWidget* shelf);
~ShelfLayoutManager() override;
@@ -214,6 +205,8 @@ class ASH_EXPORT ShelfLayoutManager
// available work area from the top of the screen.
void SetChromeVoxPanelHeight(int height);
+ static int GetShelfItemInset(ShelfLayoutManager::ShelfItemInset constant);
+
private:
class AutoHideEventFilter;
class RootWindowControllerObserverImpl;

Powered by Google App Engine
This is Rietveld 408576698