PageActions can now specify multiple icons and switch between them...

chrome/browser/tab_contents/tab_contents.h

 // 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.
 
 #ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 
 #include "build/build_config.h"
 
 #include <map>
@@ skipping 13 matching lines @@
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/browser/renderer_host/render_view_host_manager.h"
 #include "chrome/browser/tab_contents/constrained_window.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/common/gears_api.h"
 #include "chrome/common/navigation_types.h"
 #include "chrome/common/notification_registrar.h"
+#include "chrome/common/page_action.h"
 #include "chrome/common/property_bag.h"
 #include "chrome/common/renderer_preferences.h"
 #include "net/base/load_states.h"
 #include "webkit/glue/password_form.h"
 #include "webkit/glue/webpreferences.h"
 
 #if defined(OS_MACOSX) || defined(OS_LINUX)
 // Remove when we've finished porting the supporting classes.
 #include "chrome/common/temp_scaffolding_stubs.h"
 #elif defined(OS_WIN)
@@ skipping 202 matching lines @@
   // screenshotted by the DraggedTabController.
   bool capturing_contents() const { return capturing_contents_; }
   void set_capturing_contents(bool cap) { capturing_contents_ = cap; }
 
   // Indicates whether this tab should be considered crashed. The setter will
   // also notify the delegate when the flag is changed.
   bool is_crashed() const { return is_crashed_; }
   void SetIsCrashed(bool state);
 
   // Adds/removes a page action to the list of page actions that are active in
+  // this tab. The parameter |title| (if not empty) can be used to override the
+  // page action title for this tab and |icon_id| specifies an icon index
+  // (defined in the manifest) to use instead of the first icon (for this tab).
+  void SetPageActionEnabled(const PageAction* page_action, bool enable,
+                            const std::string& title, int icon_id);
+
+  // Returns the page action state for this tab. The pair returns contains
+  // the title (string) for the page action and the icon index to use (int).
+  // If this function returns NULL it means the page action is not enabled for
   // this tab.
-  void SetPageActionEnabled(const PageAction* page_action, bool enable);
-  // Checks to see if the PageAction should be visible in this tab.
-  bool IsPageActionEnabled(const PageAction* page_action);
+  const PageActionState* GetPageActionState(const PageAction* page_action);
 
   // Whether the tab is in the process of being destroyed.
   // Added as a tentative work-around for focus related bug #4633.  This allows
   // us not to store focus when a tab is being closed.
   bool is_being_destroyed() const { return is_being_destroyed_; }
 
   // Convenience method for notifying the delegate of a navigation state
   // change. See TabContentsDelegate.
   void NotifyNavigationStateChanged(unsigned changed_flags);
 
@@ skipping 757 matching lines @@
   // Keeps track of the last search string that was used to search in any tab.
   string16* last_search_prepopulate_text_;
 
   // The last find result. This object contains details about the number of
   // matches, the find selection rectangle, etc. The UI can access this
   // information to build its presentation.
   FindNotificationDetails last_search_result_;
 
   // Data for Page Actions -----------------------------------------------------
 
-  // A set of page actions that are enabled in this tab. This list is cleared
-  // every time the mainframe navigates and populated by the PageAction
-  // extension API.
-  std::set<const PageAction*> enabled_page_actions_;
+  // A map of page actions that are enabled in this tab (and a state object
+  // that can be used to override the title and icon used for the page action).
+  // This map is cleared every time the mainframe navigates and populated by the
+  // PageAction extension API.
+  std::map<const PageAction*, linked_ptr<PageActionState>>
+      enabled_page_actions_;
 
   // Data for misc internal state ----------------------------------------------
 
   // See capturing_contents() above.
   bool capturing_contents_;
 
   // See getter above.
   bool is_being_destroyed_;
 
   // Indicates whether we should notify about disconnection of this
@@ skipping 19 matching lines @@
   // True if the user has decided to block future javascript messages. This is
   // reset on navigations to false on navigations.
   bool suppress_javascript_messages_;
 
   // ---------------------------------------------------------------------------
 
   DISALLOW_COPY_AND_ASSIGN(TabContents);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_