Implement new page action API.

chrome/browser/tab_contents/tab_contents.cc

 // Copyright (c) 2009 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/tab_contents/tab_contents.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_version_info.h"
 #include "base/process_util.h"
@@ skipping 591 matching lines @@
 
   is_crashed_ = state;
   NotifyNavigationStateChanged(INVALIDATE_TAB);
 }
 
 void TabContents::SetPageActionEnabled(const ExtensionAction* page_action,
                                        bool enable,
                                        const std::string& title,
                                        int icon_id) {
   DCHECK(page_action);
-
-  if (!enable &&
-      enabled_page_actions_.end() == enabled_page_actions_.find(page_action)) {
-    return;  // Don't need to disable twice.
-  }
-
-  if (enable) {
-    enabled_page_actions_[page_action].reset(
-        new ExtensionActionState(title, icon_id));
-  } else {
-    enabled_page_actions_.erase(page_action);
-  }
+  ExtensionActionState* state = GetOrCreatePageActionState(page_action);
+  state->set_hidden(!enable);
+  state->set_title(title);
+  state->set_icon_index(icon_id);
+  state->set_icon(NULL);
 }
 
 const ExtensionActionState* TabContents::GetPageActionState(
     const ExtensionAction* page_action) {
-  if (enabled_page_actions_.end() == enabled_page_actions_.find(page_action))
+  if (page_actions_.end() == page_actions_.find(page_action))
     return NULL;
 
-  return enabled_page_actions_[page_action].get();
+  return page_actions_[page_action].get();
+}
+
+ExtensionActionState* TabContents::GetOrCreatePageActionState(
+    const ExtensionAction* page_action) {
+  if (page_actions_.end() == page_actions_.find(page_action)) {
+    page_actions_[page_action].reset(
+        new ExtensionActionState(page_action->title(), 0));
+  }
+
+  return page_actions_[page_action].get();
+}
+
+void TabContents::PageActionStateChanged() {
+  NotifyNavigationStateChanged(TabContents::INVALIDATE_PAGE_ACTIONS);
 }
 
 void TabContents::NotifyNavigationStateChanged(unsigned changed_flags) {
   if (delegate_)
     delegate_->NavigationStateChanged(this, changed_flags);
 }
 
 void TabContents::DidBecomeSelected() {
   controller_.SetActive(true);
   if (render_widget_host_view()) {
@@ skipping 751 matching lines @@
   // the commit.
   GenerateKeywordIfNecessary(params);
 
   // Allow the new page to set the title again.
   received_page_title_ = false;
 
   // Get the favicon, either from history or request it from the net.
   fav_icon_helper_.FetchFavIcon(details.entry->url());
 
   // Disable all page actions, unless this is an in-page navigation.
-  if (!enabled_page_actions_.empty()) {
+  if (!page_actions_.empty()) {
     url_canon::Replacements<char> replacements;
     replacements.ClearRef();
     if (params.url.ReplaceComponents(replacements) !=
         params.referrer.ReplaceComponents(replacements)) {
-      enabled_page_actions_.clear();
+      page_actions_.clear();
     }
   }
 
   // Close constrained popups if necessary.
   MaybeCloseChildWindows(details.previous_url, details.entry->url());
 
   // Update the starred state.
   UpdateStarredStateForCurrentURL();
 }
 
@@ skipping 1199 matching lines @@
 #endif
 
     default:
       NOTREACHED();
   }
 }
 
 void TabContents::set_encoding(const std::string& encoding) {
   encoding_ = CharacterEncoding::GetCanonicalEncodingNameByAliasName(encoding);
 }
-