[Mac][Material Design] Change toolbar buttons to 24x24 from 28x28.

chrome/browser/ui/toolbar/toolbar_actions_bar.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.h"
 
 #include <utility>
 
 #include "base/auto_reset.h"
 #include "base/location.h"
@@ skipping 27 matching lines @@
 #include "ui/gfx/image/image_skia.h"
 
 namespace {
 
 using WeakToolbarActions = std::vector<ToolbarActionViewController*>;
 
 enum DimensionType { WIDTH, HEIGHT };
 
 // Returns the width or height of the toolbar action icon size.
 int GetIconDimension(DimensionType type) {
+#if defined(OS_MACOSX)
+  // On the Mac, the spec is a 24x24 button in a 28x28 space.
+  if (ui::MaterialDesignController::IsModeMaterial())
+    return 24;

[sky, 2016/04/11 15:13:02]

The conditional is the same, so move the ifdef inside the conditional, eg:
if (ui::MaterialDesignController::IsModeM...) {
#if defined
...
#else
#endif
}

+#else
   if (ui::MaterialDesignController::IsModeMaterial())
     return 28;
+#endif
 
   static bool initialized = false;
   static int icon_height = 0;
   static int icon_width = 0;
   if (!initialized) {
     initialized = true;
     gfx::ImageSkia* skia =
         ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
             IDR_BROWSER_ACTION);
     icon_height = skia->height();
@@ skipping 723 matching lines @@
   for (ToolbarActionViewController* action : toolbar_actions_) {
     if (action->GetId() == action_id)
       return action;
   }
   return nullptr;
 }
 
 content::WebContents* ToolbarActionsBar::GetCurrentWebContents() {
   return browser_->tab_strip_model()->GetActiveWebContents();
 }