[Extensions UI] Clean up extension icon generation

chrome/browser/ui/views/location_bar/page_action_image_view.cc

 // Copyright (c) 2012 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/location_bar/page_action_image_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 86 matching lines @@
       (!preview_enabled_ && !extension_action()->GetIsVisible(tab_id))) {
     SetVisible(false);
     return;
   }
 
   // Set the tooltip.
   tooltip_ = extension_action()->GetTitle(tab_id);
   SetTooltipText(base::UTF8ToUTF16(tooltip_));
 
   // Set the image.
-  gfx::Image icon = view_controller_->GetIcon(contents);
+  gfx::Image icon = view_controller_->GetIcon(contents, GetPreferredSize());
   if (!icon.IsEmpty())
     SetImage(*icon.ToImageSkia());
 
   SetVisible(true);
 }
 
-void PageActionImageView::PaintChildren(const ui::PaintContext& context) {
-  View::PaintChildren(context);
-  int tab_id = SessionTabHelper::IdForTab(GetCurrentWebContents());
-  if (tab_id >= 0) {
-    ui::PaintRecorder recorder(context);
-    view_controller_->extension_action()->PaintBadge(recorder.canvas(),
-                                                     GetLocalBounds(), tab_id);
-  }
-}
-
 void PageActionImageView::UpdateState() {
   UpdateVisibility(GetCurrentWebContents());
 }
 
 views::View* PageActionImageView::GetAsView() {
   return this;
 }
 
 bool PageActionImageView::IsMenuRunning() const {
   return menu_runner_.get() != nullptr;
@@ skipping 30 matching lines @@
                               nullptr,  // No menu button for page action views.
                               gfx::Rect(screen_loc, size()),
                               views::MENU_ANCHOR_TOPLEFT,
                               source_type) == views::MenuRunner::MENU_DELETED) {
     return;
   }
 
   menu_runner_.reset();
   view_controller_->OnContextMenuClosed();
 }