[MD] re-skin extension browser action badges

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 "base/auto_reset.h"
 #include "base/location.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_observer.h"
 #include "chrome/common/pref_names.h"
 #include "components/crx_file/id_util.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/runtime_data.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/feature_switch.h"
 #include "grit/theme_resources.h"
+#include "ui/base/resource/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace {
 
 using WeakToolbarActions = std::vector<ToolbarActionViewController*>;
 
 // Matches ToolbarView::kStandardSpacing;
 const int kLeftPadding = 3;
 const int kRightPadding = kLeftPadding;
 const int kItemSpacing = kLeftPadding;
 const int kOverflowLeftPadding = kItemSpacing;
 const int kOverflowRightPadding = kItemSpacing;
 
 enum DimensionType { WIDTH, HEIGHT };
 
 // Returns the width or height of the toolbar action icon size.
 int GetIconDimension(DimensionType type) {
+  if (ui::MaterialDesignController::IsModeMaterial())
+    return 28;

[Devlin, 2015/12/01 21:06:42]

Is this guaranteed to be the same across all platforms?

[Evan Stade, 2015/12/01 23:15:58]

if you mean OSX vs. Windows, yes. I think it might need to change for hybrid
material mode. It would probably be best to use
GetLayoutConstant(LOCATION_BAR_HEIGHT), and to use that I've had to move the
file out of views/

+pkasting, +tdanderson

[tdanderson, 2015/12/02 00:57:10]

Actually there is no difference between material and hybrid in this case. Both
should be 28 so using LOCATION_BAR_HEIGHT here is incorrect. 

+
   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();
     icon_width = skia->width();
@@ skipping 731 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();
 }