Modify toolbar action bar layout for material design

chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 186 matching lines @@
     CreateAndAddExtension(
         base::StringPrintf("extension %d", i),
         extensions::extension_action_test_util::BROWSER_ACTION);
   }
 
   const ToolbarActionsBar::PlatformSettings& platform_settings =
       toolbar_actions_bar()->platform_settings();
 
   // By default, all three actions should be visible.
   EXPECT_EQ(3u, toolbar_actions_bar()->GetIconCount());
-  // Check the widths.
-  int expected_width = 3 * ToolbarActionsBar::IconWidth(true) -
-                       platform_settings.item_spacing +
-                       platform_settings.left_padding +
-                       platform_settings.right_padding;
+  // Check the widths. IconWidth(true) includes the spacing to the left of
+  // each icon and |item_spacing| accounts for the spacing to the right
+  // of the rightmost icon.
+  int expected_width =
+      3 * ToolbarActionsBar::IconWidth(true) + platform_settings.item_spacing;
   EXPECT_EQ(expected_width, toolbar_actions_bar()->GetPreferredSize().width());
   // Since all icons are showing, the current width should be the max width.
   int maximum_width = expected_width;
   EXPECT_EQ(maximum_width, toolbar_actions_bar()->GetMaximumWidth());
-  // The minimum width should be just enough for the chevron to be displayed.
-  int minimum_width = platform_settings.left_padding +
-                      platform_settings.right_padding +
+  // The minimum width should be just enough for the chevron to be displayed
+  // along with left and right padding.
+  int minimum_width = 2 * platform_settings.item_spacing +
                       toolbar_actions_bar()->delegate_for_test()->
                           GetChevronWidth();
   EXPECT_EQ(minimum_width, toolbar_actions_bar()->GetMinimumWidth());
 
   // Test the connection between the ToolbarActionsBar and the model by
   // adjusting the visible count.
   toolbar_model()->SetVisibleIconCount(2u);
   EXPECT_EQ(2u, toolbar_actions_bar()->GetIconCount());
 
   // The current width should now be enough for two icons, and the chevron.
-  expected_width = 2 * ToolbarActionsBar::IconWidth(true) -
+  // IconWidth(true) includes the spacing to the left of each icon and
+  // |item_spacing| accounts for the spacing to the right of the rightmost
+  // icon.
+  expected_width = 2 * ToolbarActionsBar::IconWidth(true) +
                    platform_settings.item_spacing +
-                   platform_settings.left_padding +
-                   platform_settings.right_padding +
                    toolbar_actions_bar()->delegate_for_test()->
                        GetChevronWidth();
   EXPECT_EQ(expected_width, toolbar_actions_bar()->GetPreferredSize().width());
   // The maximum and minimum widths should have remained constant (since we have
   // the same number of actions).
   EXPECT_EQ(maximum_width, toolbar_actions_bar()->GetMaximumWidth());
   EXPECT_EQ(minimum_width, toolbar_actions_bar()->GetMinimumWidth());
 
   // Test drag-and-drop logic.
   const char kExtension0[] = "extension 0";
@@ skipping 315 matching lines @@
   // Set the width back to the preferred width. All should be back to normal.
   browser_action_test_util()->SetWidth(
       toolbar_actions_bar()->GetPreferredSize().width());
   EXPECT_EQ(3u, toolbar_actions_bar()->GetIconCount());
   EXPECT_EQ(0u, toolbar_actions_bar()->GetStartIndexInBounds());
   EXPECT_EQ(3u, toolbar_actions_bar()->GetEndIndexInBounds());
   EXPECT_EQ(3u, overflow_bar()->GetStartIndexInBounds());
   EXPECT_EQ(3u, overflow_bar()->GetEndIndexInBounds());
   EXPECT_FALSE(toolbar_actions_bar()->NeedsOverflow());
 }