Update shelf spacing in Chrome OS according to the MD specs

ash/shelf/shelf_layout_manager.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
 
 #include <memory>
 #include <vector>
 
@@ skipping 49 matching lines @@
 // closely with ShelfLayoutManager.
 class ASH_EXPORT ShelfLayoutManager
     : public ash::ShellObserver,
       public aura::client::ActivationChangeObserver,
       public DockedWindowLayoutManagerObserver,
       public keyboard::KeyboardControllerObserver,
       public LockStateObserver,
       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 instead?

+  };
 
   explicit ShelfLayoutManager(ShelfWidget* shelf);
   ~ShelfLayoutManager() override;
 
   void set_workspace_controller(WorkspaceController* controller) {
     workspace_controller_ = controller;
   }
 
   bool updating_bounds() const { return updating_bounds_; }
 
@@ skipping 113 matching lines @@
     return IsHorizontalAlignment() ? horizontal : vertical;
   }
 
   // Is the shelf's alignment horizontal?
   bool IsHorizontalAlignment() const;
 
   // Set the height of the ChromeVox panel, which takes away space from the
   // available work area from the top of the screen.
   void SetChromeVoxPanelHeight(int height);
 
+  static int GetShelfItemInset(ShelfLayoutManager::ShelfItemInset constant);
+
  private:
   class AutoHideEventFilter;
   class RootWindowControllerObserverImpl;
   class UpdateShelfObserver;
   friend class AshPopupAlignmentDelegateTest;
   friend class ash::ScreenAsh;
   friend class PanelLayoutManagerTest;
   friend class ShelfLayoutManagerTest;
   friend class ToastManagerTest;
   FRIEND_TEST_ALL_PREFIXES(ash::AshPopupAlignmentDelegateTest, AutoHide);
@@ skipping 174 matching lines @@
 
   std::unique_ptr<RootWindowControllerObserverImpl>
       root_window_controller_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_