Index: chrome/browser/ui/extensions/extension_action_view_controller.cc |
diff --git a/chrome/browser/ui/extensions/extension_action_view_controller.cc b/chrome/browser/ui/extensions/extension_action_view_controller.cc |
index 20937975aedb3f13fcb638772be373548e41ec2d..fbb8ebbab68afad7a5707a844917f42cfbe74146 100644 |
--- a/chrome/browser/ui/extensions/extension_action_view_controller.cc |
+++ b/chrome/browser/ui/extensions/extension_action_view_controller.cc |
@@ -27,7 +27,6 @@ |
#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" |
@@ -366,16 +365,7 @@ ExtensionActionViewController::GetIconImageSource( |
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); |