Modify toolbar action bar layout for material design

chrome/browser/ui/views/toolbar/browser_actions_container.h

 // Copyright 2013 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 CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_
 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_
 
 #include "base/observer_list.h"
 #include "chrome/browser/extensions/extension_keybinding_registry.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
@@ skipping 34 matching lines @@
 // toolbar does not) and as such does not have an overflow itself. The overflow
 // container also does not support resizing. Since the main container only shows
 // icons in the Chrome toolbar, it is limited to a single row of icons. The
 // overflow container, however, is allowed to display icons in multiple rows.
 //
 // The main container is placed flush against the omnibox and hot dog menu,
 // whereas the overflow container is placed within the hot dog menu. The
 // layout is similar to this:
 //   rI_I_IcCs
 // Where the letters are as follows:
-//   r: An invisible resize area.  This is ToolbarView::kStandardSpacing pixels
-//      wide and directly adjacent to the omnibox. Only shown for the main
-//      container.
-//   I: An icon.  This is as wide as the IDR_BROWSER_ACTION image.
-//   _: kItemSpacing pixels of empty space.
-//   c: kChevronSpacing pixels of empty space.  Only present if C is present.
+//   r: An invisible resize area.  This is
+//      GetLayoutConstant(TOOLBAR_STANDARD_SPACING) pixels wide and directly
+//      adjacent to the omnibox. Only shown for the main container.
+//   I: An icon. In material design this has a width of 28. Otherwise it is as
+//      wide as the IDR_BROWSER_ACTION image.
+//   _: ToolbarActionsBar::PlatformSettings::item_spacing pixels of empty space.
+//   c: GetChevronSpacing() pixels of empty space. Only present if C is present.
 //   C: An optional chevron, as wide as the IDR_BROWSER_ACTIONS_OVERFLOW image,
 //      and visible only when both of the following statements are true:
 //      - The container is set to a width smaller than needed to show all icons.
 //      - There is no other container in 'overflow' mode to handle the
 //        non-visible icons for this container.
-//   s: ToolbarView::kStandardSpacing pixels of empty space (before the app
-//      menu).
+//   s: GetLayoutConstant(TOOLBAR_STANDARD_SPACING) pixels of empty space
+//      (before the app menu).
 // The reason the container contains the trailing space "s", rather than having
 // it be handled by the parent view, is so that when the chevron is invisible
 // and the user starts dragging an icon around, we have the space to draw the
 // ultimate drop indicator.  (Otherwise, we'd be trying to draw it into the
 // padding beyond our right edge, and it wouldn't appear.)
 //
 // The BrowserActionsContainer in 'main' mode follows a few rules, in terms of
 // user experience:
 //
 // 1) The container can never grow beyond the space needed to show all icons
@@ skipping 269 matching lines @@
   // The class that registers for keyboard shortcuts for extension commands.
   scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_;
 
   // The extension bubble that is actively showing, if any.
   views::BubbleDelegateView* active_bubble_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TOOLBAR_BROWSER_ACTIONS_CONTAINER_H_