Turn pageAction.show -> browserAction.sensibleThing.

chrome/browser/extensions/extension_toolbar_model.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_toolbar_model.h"
 
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
@@ skipping 78 matching lines @@
     Browser* browser,
     GURL* popup_url_out) {
   TabContents* tab_contents = browser->GetActiveTabContents();
   if (!tab_contents)
     return ACTION_NONE;
 
   int tab_id = ExtensionTabUtil::GetTabId(tab_contents->web_contents());
   if (tab_id < 0)
     return ACTION_NONE;
 
+  ExtensionAction* browser_action = extension->browser_action();
+
+  // For browser actions, visibility == enabledness.
+  if (!browser_action->GetIsVisible(tab_id))
+    return ACTION_NONE;
+
   tab_contents->extension_tab_helper()->active_tab_permission_manager()->
       GrantIfRequested(extension);
 
-  ExtensionAction* browser_action = extension->browser_action();
   if (browser_action->HasPopup(tab_id)) {
     if (popup_url_out)
       *popup_url_out = browser_action->GetPopupUrl(tab_id);
     return ACTION_SHOW_POPUP;
   }
 
   service_->browser_event_router()->BrowserActionExecuted(
       *browser_action, browser);
   return ACTION_NONE;
 }
@@ skipping 175 matching lines @@
   int incognito_index = 0, i = 0;
   for (ExtensionList::iterator iter = begin(); iter != end();
        ++iter, ++i) {
     if (original_index == i)
       break;
     if (service_->IsIncognitoEnabled((*iter)->id()))
       ++incognito_index;
   }
   return incognito_index;
 }