Turn pageAction.show -> browserAction.sensibleThing.

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"
@@ skipping 82 matching lines @@
       keybinding_.reset(new ui::Accelerator(
           browser_action_command.accelerator()));
       panel_->GetFocusManager()->RegisterAccelerator(
           *keybinding_.get(), ui::AcceleratorManager::kHighPriority, this);
     }
   }
 
   MenuButton::ViewHierarchyChanged(is_add, parent, child);
 }
 
+bool BrowserActionButton::IsEnabled() const {
+  int tab_id = panel_->GetCurrentTabId();
+  if (tab_id < 0) {
+    // Default is "true" because disabled is the uncommon state.
+    return true;
+  }
+
+  return browser_action()->GetIsVisible(tab_id);
+}
+
 bool BrowserActionButton::CanHandleAccelerators() const {
   // View::CanHandleAccelerators() checks to see if the view is visible before
   // allowing it to process accelerators. This is not appropriate for browser
   // actions buttons, which can be hidden inside the overflow area.
   return true;
 }
 
 void BrowserActionButton::ButtonPressed(views::Button* sender,
                                         const views::Event& event) {
   panel_->OnBrowserActionExecuted(this);
 }
 
 void BrowserActionButton::OnImageLoaded(const gfx::Image& image,
                                         const std::string& extension_id,
                                         int index) {
   if (!image.IsEmpty())
     default_icon_ = *image.ToSkBitmap();
 
   // 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;
 
+  // XXX: this needs to cooperate with SetButton(Not)Pushed.
+  SetState(IsEnabled() ?
+      views::CustomButton::BS_NORMAL :
+      views::CustomButton::BS_DISABLED);
+
   SkBitmap icon(browser_action()->GetIcon(tab_id));
   if (icon.isNull())
     icon = default_icon_;
   if (!icon.isNull()) {
+    icon = browser_action()->RenderIconVisibility(icon, tab_id);
+
     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 194 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);
 }