[Extensions UI] Clean up extension icon generation

chrome/browser/ui/views/toolbar/toolbar_action_view.cc

 // 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.
 
 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h"
 
 #include <string>
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 16 matching lines @@
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/resources/grit/views_resources.h"
 
 using views::LabelButtonBorder;
 
 namespace {
 
-// We have smaller insets than normal STYLE_TEXTBUTTON buttons so that we can
-// fit user supplied icons in without clipping them.
-const int kBorderInset = 4;
+// Toolbar action buttons have no insets because the badges are drawn right at
+// the edge of the view's area. Other badding (such as centering the icon) is
+// handled directly by the Image.
+const int kBorderInset = 0;

[Finnur, 2015/07/06 10:27:09]

nit: Is the inset not 0 by default?

[Devlin, 2015/07/06 19:16:07]

Not for a LabelButtonBorder, no - it's all handled in
LabelButtonBorder::GetDefaultInsetsForStyle().

 
 // The ToolbarActionView which is currently showing its context menu, if any.
 // Since only one context menu can be shown (even across browser windows), it's
 // safe to have this be a global singleton.
 ToolbarActionView* context_menu_owner = nullptr;
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarActionView
@@ skipping 65 matching lines @@
 void ToolbarActionView::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (details.is_add && !called_register_command_ && GetFocusManager()) {
     view_controller_->RegisterCommand();
     called_register_command_ = true;
   }
 
   MenuButton::ViewHierarchyChanged(details);
 }
 
-void ToolbarActionView::PaintChildren(const ui::PaintContext& context) {
-  View::PaintChildren(context);
-  ui::PaintRecorder recorder(context);
-  view_controller_->PaintExtra(recorder.canvas(), GetLocalBounds(),
-                               GetCurrentWebContents());
-}
-
 void ToolbarActionView::OnPaintBorder(gfx::Canvas* canvas) {
   if (!wants_to_run_)
     views::MenuButton::OnPaintBorder(canvas);
   else
     wants_to_run_border_->Paint(*this, canvas);
 }
 
 void ToolbarActionView::GetAccessibleState(ui::AXViewState* state) {
   views::MenuButton::GetAccessibleState(state);
   state->role = ui::AX_ROLE_BUTTON;
 }
 
 void ToolbarActionView::ButtonPressed(views::Button* sender,
                                       const ui::Event& event) {
   view_controller_->ExecuteAction(true);
 }
 
 void ToolbarActionView::UpdateState() {
   content::WebContents* web_contents = GetCurrentWebContents();
   if (SessionTabHelper::IdForTab(web_contents) < 0)
     return;
 
   if (!view_controller_->IsEnabled(web_contents))
     SetState(views::CustomButton::STATE_DISABLED);
   else if (state() == views::CustomButton::STATE_DISABLED)
     SetState(views::CustomButton::STATE_NORMAL);
 
   wants_to_run_ = view_controller_->WantsToRun(web_contents);
 
-  gfx::ImageSkia icon(view_controller_->GetIcon(web_contents).AsImageSkia());
+  gfx::ImageSkia icon(
+      view_controller_->GetIcon(web_contents,
+                                GetPreferredSize()).AsImageSkia());
 
   if (!icon.isNull()) {
     ThemeService* theme = ThemeServiceFactory::GetForProfile(profile_);
 
     gfx::ImageSkia bg = *theme->GetImageSkiaNamed(IDR_BROWSER_ACTION);
     SetImage(views::Button::STATE_NORMAL,
              gfx::ImageSkiaOperations::CreateSuperimposedImage(bg, icon));
   }
 
   SetTooltipText(view_controller_->GetTooltip(web_contents));
@@ skipping 206 matching lines @@
     if (menu_controller->in_nested_run()) {
       // There is another menu showing. Close the outermost menu (since we are
       // shown in the same menu, we don't want to close the whole thing).
       menu_controller->Cancel(views::MenuController::EXIT_OUTERMOST);
       return true;
     }
   }
 
   return false;
 }