[Extensions UI] Add a placeholder icon for extensions in the toolbar

chrome/browser/extensions/extension_action.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/extensions/extension_action.h"
 
 #include <algorithm>
 
 #include "base/base64.h"
 #include "base/logging.h"
 #include "chrome/common/badge_util.h"
 #include "chrome/common/icon_with_badge_image_source.h"
 #include "extensions/browser/extension_icon_image.h"
+#include "extensions/browser/extension_icon_placeholder.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_icon_set.h"
+#include "extensions/common/feature_switch.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_utils.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 70 matching lines @@
 
 }  // namespace
 
 const int ExtensionAction::kDefaultTabId = -1;
 const int ExtensionAction::kPageActionIconMaxSize =
     extension_misc::EXTENSION_ICON_ACTION;
 
 ExtensionAction::ExtensionAction(const extensions::Extension& extension,
                                  extensions::ActionInfo::Type action_type,
                                  const extensions::ActionInfo& manifest_data)
-    : extension_id_(extension.id()), action_type_(action_type) {
+    : extension_id_(extension.id()),
+      extension_name_(extension.name()),
+      action_type_(action_type) {
   // Page/script actions are hidden/disabled by default, and browser actions are
   // visible/enabled by default.
   SetIsVisible(kDefaultTabId,
                action_type == extensions::ActionInfo::TYPE_BROWSER);
   Populate(extension, manifest_data);
 }
 
 ExtensionAction::~ExtensionAction() {
 }
 
@@ skipping 158 matching lines @@
         GetIconSizeForType(action_type_),
         *GetDefaultIcon().ToImageSkia(),
         nullptr));
   }
   return default_icon_image_.get();
 }
 
 gfx::Image ExtensionAction::GetDefaultIconImage() const {
   // If we have a default icon, it should be loaded before trying to use it.
   DCHECK(!default_icon_image_ == !default_icon_);
-  return default_icon_image_ ? default_icon_image_->image() : GetDefaultIcon();
+  if (default_icon_image_)
+    return default_icon_image_->image();
+
+  // If the extension action redesign is enabled, we use a special placeholder
+  // icon (with the first letter of the extension name) rather than the default
+  // (puzzle piece).
+  if (extensions::FeatureSwitch::extension_action_redesign()->IsEnabled()) {
+    return extensions::ExtensionIconPlaceholder::CreateImage(
+        extension_misc::EXTENSION_ICON_ACTION, extension_name_);
+  }
+
+  return GetDefaultIcon();
 }
 
 bool ExtensionAction::HasPopupUrl(int tab_id) const {
   return HasValue(popup_url_, tab_id);
 }
 
 bool ExtensionAction::HasTitle(int tab_id) const {
   return HasValue(title_, tab_id);
 }
 
@@ skipping 71 matching lines @@
   // If there is a default icon, the icon width will be set depending on our
   // action type.
   if (default_icon_)
     return GetIconSizeForType(action_type());
 
   // If no icon has been set and there is no default icon, we need favicon
   // width.
   return ui::ResourceBundle::GetSharedInstance().GetImageNamed(
           IDR_EXTENSIONS_FAVICON).Width();
 }