Turn pageAction.show -> browserAction.sensibleThing.

chrome/browser/extensions/api/extension_action/extension_actions_api.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/api/extension_action/extension_actions_api.h"
 
 #include <string>
 
 #include "base/string_number_conversions.h"
 #include "base/string_piece.h"
@@ skipping 96 matching lines @@
           kNoTabError, base::IntToString(tab_id_));
       return false;
     }
   }
 
   return RunExtensionAction();
 }
 
 void ExtensionActionFunction::NotifyChange() {
   switch (extension_action_->action_type()) {
-    case ExtensionAction::TYPE_BROWSER:
-      NotifyBrowserActionChange();
-      return;
-    case ExtensionAction::TYPE_PAGE:
     case ExtensionAction::TYPE_SCRIPT_BADGE:
       NotifyLocationBarChange();
       return;
+    case ExtensionAction::TYPE_BROWSER:
+    case ExtensionAction::TYPE_PAGE:
+      if (extension_->browser_action())
+        NotifyBrowserActionChange();
+      else if (extension_->page_action())
+        NotifyLocationBarChange();
+      else
+        NOTREACHED();
+      return;
   }
   NOTREACHED();
 }
 
 void ExtensionActionFunction::NotifyBrowserActionChange() {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED,
       content::Source<ExtensionAction>(extension_action_),
       content::NotificationService::NoDetails());
 }
@@ skipping 33 matching lines @@
       return false;
     if (color_ints[i] > 255 || color_ints[i] < 0)
       return false;
   }
 
   *result = SkColorSetARGB(255, color_ints[0], color_ints[1], color_ints[2]);
   return true;
 }
 
 bool ExtensionActionFunction::SetVisible(bool visible) {
-  // If --enable-script-badges is on there will be a browser_action here
-  // instead of a page action. Disable/renable the browser action perhaps?
-  if (!GetExtension()->page_action())
-    return true;
   extension_action_->SetIsVisible(tab_id_, visible);
   NotifyChange();
   return true;
 }
 
 bool ExtensionActionShowFunction::RunExtensionAction() {
   return SetVisible(true);
 }
 
 bool ExtensionActionHideFunction::RunExtensionAction() {
@@ skipping 109 matching lines @@
 bool ExtensionActionGetBadgeBackgroundColorFunction::RunExtensionAction() {
   ListValue* list = new ListValue();
   SkColor color = extension_action_->GetBadgeBackgroundColor(tab_id_);
   list->Append(Value::CreateIntegerValue(SkColorGetR(color)));
   list->Append(Value::CreateIntegerValue(SkColorGetG(color)));
   list->Append(Value::CreateIntegerValue(SkColorGetB(color)));
   list->Append(Value::CreateIntegerValue(SkColorGetA(color)));
   result_.reset(list);
   return true;
 }