Fixed pageActions.enableForTab

chrome/browser/extensions/api/extension_action/extension_page_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_page_actions_api.h"
 
 #include <string>
 
 #include "base/string_number_conversions.h"
 #include "chrome/browser/extensions/api/extension_action/extension_page_actions_api_constants.h"
@@ skipping 49 matching lines @@
     return false;
   }
   contents_ = wrapper;
 
   if (!RunExtensionAction())
     return false;
 
   return true;
 }
 
-bool PageActionFunction::SetPageActionEnabled(bool enable) {
+bool PageActionsFunction::SetPageActionEnabled(bool enable) {
   std::string extension_action_id;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &extension_action_id));
   DictionaryValue* action = NULL;
   EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &action));
 
+  int tab_id;
+  EXTENSION_FUNCTION_VALIDATE(action->GetInteger(keys::kTabIdKey, &tab_id));
   std::string url;
   EXTENSION_FUNCTION_VALIDATE(action->GetString(keys::kUrlKey, &url));
 
   std::string title;
   int icon_id = 0;
   if (enable) {
     // Both of those are optional.
     if (action->HasKey(keys::kTitleKey))
       EXTENSION_FUNCTION_VALIDATE(action->GetString(keys::kTitleKey, &title));
     if (action->HasKey(keys::kIconIdKey)) {
@@ skipping 10 matching lines @@
 
   if (icon_id < 0 ||
       static_cast<size_t>(icon_id) >= page_action->icon_paths()->size()) {
     error_ = (icon_id == 0) ? kNoIconSpecified : kIconIndexOutOfBounds;
     return false;
   }
 
   // Find the TabContents that contains this tab id.
   TabContentsWrapper* contents = NULL;
   bool result = ExtensionTabUtil::GetTabById(
-      tab_id_, profile(), include_incognito(), NULL, NULL, &contents, NULL);
+      tab_id, profile(), include_incognito(), NULL, NULL, &contents, NULL);
   if (!result || !contents) {
     error_ = ExtensionErrorUtils::FormatErrorMessage(
-        kNoTabError, base::IntToString(tab_id_));
+        kNoTabError, base::IntToString(tab_id));
     return false;
   }
 
   // Make sure the URL hasn't changed.
   NavigationEntry* entry =
       contents->web_contents()->GetController().GetActiveEntry();
   if (!entry || url != entry->GetURL().spec()) {
     error_ = ExtensionErrorUtils::FormatErrorMessage(kUrlNotActiveError, url);
     return false;
   }
 
   // Set visibility and broadcast notifications that the UI should be updated.
-  page_action->SetIsVisible(tab_id_, enable);
-  page_action->SetTitle(tab_id_, title);
-  page_action->SetIconIndex(tab_id_, icon_id);
+  page_action->SetIsVisible(tab_id, enable);
+  page_action->SetTitle(tab_id, title);
+  page_action->SetIconIndex(tab_id, icon_id);
   contents->extension_tab_helper()->PageActionStateChanged();
 
   return true;
 }
 
 bool PageActionFunction::SetVisible(bool visible) {
   extension_action_->SetIsVisible(tab_id_, visible);
   contents_->extension_tab_helper()->PageActionStateChanged();
   return true;
 }
 
-bool EnablePageActionFunction::RunExtensionAction() {
+PageActionsFunction::PageActionsFunction() {

[Aaron Boodman, 2012/04/13 22:52:52]

can you move the constructor and destructor impls up above the first method?

[cduvall, 2012/04/13 22:59:19]

Done.

+}
+
+PageActionsFunction::~PageActionsFunction() {
+}
+
+bool EnablePageActionsFunction::RunImpl() {
   return SetPageActionEnabled(true);
 }
 
-bool DisablePageActionFunction::RunExtensionAction() {
+bool DisablePageActionsFunction::RunImpl() {
   return SetPageActionEnabled(false);
 }
 
 bool PageActionShowFunction::RunExtensionAction() {
   return SetVisible(true);
 }
 
 bool PageActionHideFunction::RunExtensionAction() {
   return SetVisible(false);
 }
@@ skipping 84 matching lines @@
 // extension_function_dispatcher.
 bool PageActionGetBadgeBackgroundColorFunction::RunExtensionAction() {
   return GetBadgeBackgroundColor();
 }
 
 // Not currently exposed to extensions. To re-enable, add mapping in
 // extension_function_dispatcher.
 bool PageActionGetBadgeTextFunction::RunExtensionAction() {
   return GetBadgeText();
 }