Page actions behave as disableable browser actions when script badges are enabled.

chrome/browser/ui/views/browser_action_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/browser_action_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/api/commands/command_service_factory.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/browser_actions_container.h"
 #include "chrome/browser/ui/views/toolbar_view.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/skbitmap_operations.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 
 using extensions::Extension;
 
+namespace {
+
+// Return a more transparent |image|, with 25% of its original opacity.
+SkBitmap MakeTransparent(const SkBitmap& image) {
+  SkBitmap alpha;
+  alpha.setConfig(SkBitmap::kARGB_8888_Config, image.width(), image.height());
+  alpha.allocPixels();
+  alpha.eraseColor(SkColorSetARGB(64, 0, 0, 0));
+
+  return SkBitmapOperations::CreateMaskedBitmap(image, alpha);
+}
+
+}  // namespace
+
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserActionButton
 
 BrowserActionButton::BrowserActionButton(const Extension* extension,
                                          BrowserActionsContainer* panel)
     : ALLOW_THIS_IN_INITIALIZER_LIST(
           MenuButton(this, string16(), NULL, false)),
       browser_action_(extension->browser_action()),
       extension_(extension),
       ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this)),
@@ skipping 75 matching lines @@
   // Call back to UpdateState() because a more specific icon might have been set
   // while the load was outstanding.
   UpdateState();
 }
 
 void BrowserActionButton::UpdateState() {
   int tab_id = panel_->GetCurrentTabId();
   if (tab_id < 0)
     return;
 
+  if (!IsEnabled(tab_id)) {
+    SetState(views::CustomButton::BS_DISABLED);
+  } else {
+    SetState(menu_visible_ ?
+             views::CustomButton::BS_NORMAL :
+             views::CustomButton::BS_PUSHED);
+  }
+
   SkBitmap icon(browser_action()->GetIcon(tab_id));
   if (icon.isNull())
     icon = default_icon_;
   if (!icon.isNull()) {
+    if (!browser_action()->GetIsVisible(tab_id))
+      icon = MakeTransparent(icon);
     SkPaint paint;
     paint.setXfermode(SkXfermode::Create(SkXfermode::kSrcOver_Mode));
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
     SkBitmap bg;
     rb.GetBitmapNamed(IDR_BROWSER_ACTION)->copyTo(&bg,
         SkBitmap::kARGB_8888_Config);
     SkCanvas bg_canvas(bg);
     bg_canvas.drawBitmap(icon, SkIntToScalar((bg.width() - icon.width()) / 2),
         SkIntToScalar((bg.height() - icon.height()) / 2), &paint);
@@ skipping 17 matching lines @@
         SkIntToScalar((bg_p.height() - icon.height()) / 2), &paint);
     SetPushedIcon(bg_p);
   }
 
   // If the browser action name is empty, show the extension name instead.
   string16 name = UTF8ToUTF16(browser_action()->GetTitle(tab_id));
   if (name.empty())
     name = UTF8ToUTF16(extension()->name());
   SetTooltipText(name);
   SetAccessibleName(name);
+
   parent()->SchedulePaint();
 }
 
 bool BrowserActionButton::IsPopup() {
   int tab_id = panel_->GetCurrentTabId();
   return (tab_id < 0) ? false : browser_action_->HasPopup(tab_id);
 }
 
 GURL BrowserActionButton::GetPopupUrl() {
   int tab_id = panel_->GetCurrentTabId();
@@ skipping 116 matching lines @@
 void BrowserActionButton::SetButtonPushed() {
   SetState(views::CustomButton::BS_PUSHED);
   menu_visible_ = true;
 }
 
 void BrowserActionButton::SetButtonNotPushed() {
   SetState(views::CustomButton::BS_NORMAL);
   menu_visible_ = false;
 }
 
+bool BrowserActionButton::IsEnabled(int tab_id) const {
+  return browser_action_->GetIsVisible(tab_id);
+}
+
 BrowserActionButton::~BrowserActionButton() {
 }
 
 void BrowserActionButton::MaybeRegisterExtensionCommand() {
   extensions::CommandService* command_service =
       extensions::CommandServiceFactory::GetForProfile(
           panel_->browser()->profile());
   extensions::Command browser_action_command;
   if (command_service->GetBrowserActionCommand(
           extension_->id(),
@@ skipping 43 matching lines @@
   button_->Destroy();
 }
 
 gfx::Canvas* BrowserActionView::GetIconWithBadge() {
   int tab_id = panel_->GetCurrentTabId();
 
   SkBitmap icon = button_->extension()->browser_action()->GetIcon(tab_id);
   if (icon.isNull())
     icon = button_->default_icon();
 
+  // Dim the icon if our button is disabled.
+  if (!button_->IsEnabled(tab_id))
+    icon = MakeTransparent(icon);
+
   gfx::Canvas* canvas =
       new gfx::Canvas(gfx::ImageSkiaRep(icon, ui::SCALE_FACTOR_100P), false);
 
   if (tab_id >= 0) {
     gfx::Rect bounds(icon.width(), icon.height() + ToolbarView::kVertSpacing);
     button_->extension()->browser_action()->PaintBadge(canvas, bounds, tab_id);
   }
 
   return canvas;
 }
@@ skipping 16 matching lines @@
   state->role = ui::AccessibilityTypes::ROLE_GROUPING;
 }
 
 void BrowserActionView::PaintChildren(gfx::Canvas* canvas) {
   View::PaintChildren(canvas);
   ExtensionAction* action = button()->browser_action();
   int tab_id = panel_->GetCurrentTabId();
   if (tab_id >= 0)
     action->PaintBadge(canvas, gfx::Rect(width(), height()), tab_id);
 }