Handle more scale factors for extension Browser Action icons

chrome/browser/ui/extensions/extension_action_view_controller.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/extensions/extension_action_view_controller.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_view.h"
 #include "chrome/browser/extensions/extension_view_host.h"
 #include "chrome/browser/extensions/extension_view_host_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/extensions/accelerator_priority.h"
 #include "chrome/browser/ui/extensions/extension_action_platform_delegate.h"
 #include "chrome/browser/ui/extensions/icon_with_badge_image_source.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/feature_switch.h"
 #include "extensions/common/manifest_constants.h"
-#include "ui/base/resource/material_design/material_design_controller.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_operations.h"
 
 using extensions::ActionInfo;
 using extensions::CommandService;
 
 ExtensionActionViewController::ExtensionActionViewController(
     const extensions::Extension* extension,
     Browser* browser,
     ExtensionAction* extension_action,
@@ skipping 318 matching lines @@
 }
 
 scoped_ptr<IconWithBadgeImageSource>
 ExtensionActionViewController::GetIconImageSource(
     content::WebContents* web_contents,
     const gfx::Size& size) {
   int tab_id = SessionTabHelper::IdForTab(web_contents);
   scoped_ptr<IconWithBadgeImageSource> image_source(
       new IconWithBadgeImageSource(size));
 
-  gfx::Image icon(icon_factory_.GetIcon(tab_id));
-  if (ui::MaterialDesignController::IsModeMaterial()) {
-    // TODO(tdanderson): Use a 16x16 icon if it exists instead of resizing.
-    icon = gfx::Image(gfx::ImageSkiaOperations::CreateResizedImage(
-        *icon.ToImageSkia(),
-        skia::ImageOperations::RESIZE_BEST,
-        gfx::Size(extension_misc::EXTENSION_ICON_BITTY,
-                  extension_misc::EXTENSION_ICON_BITTY)));
-  }
-  image_source->SetIcon(icon);
+  image_source->SetIcon(icon_factory_.GetIcon(tab_id));
 
   scoped_ptr<IconWithBadgeImageSource::Badge> badge;
   std::string badge_text = extension_action_->GetBadgeText(tab_id);
   if (!badge_text.empty()) {
     badge.reset(new IconWithBadgeImageSource::Badge(
             badge_text,
             extension_action_->GetBadgeTextColor(tab_id),
             extension_action_->GetBadgeBackgroundColor(tab_id)));
   }
   image_source->SetBadge(badge.Pass());
 
   // Greyscaling disabled actions and having a special wants-to-run decoration
   // are gated on the toolbar redesign.
   if (extensions::FeatureSwitch::extension_action_redesign()->IsEnabled()) {
     // If the extension doesn't want to run on the active web contents, we
     // grayscale it to indicate that.
     image_source->set_grayscale(!IsEnabled(web_contents));
     // If the action *does* want to run on the active web contents and is also
     // overflowed, we add a decoration so that the user can see which overflowed
     // action wants to run (since they wouldn't be able to see the change from
     // grayscale to color).
     bool is_overflow =
         toolbar_actions_bar_ && toolbar_actions_bar_->in_overflow_mode();
     image_source->set_paint_decoration(WantsToRun(web_contents) && is_overflow);
   }
 
   return image_source.Pass();
 }