Make a ShowExtensionActionPopup function

chrome/browser/extensions/extension_toolbar_model.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_TOOLBAR_MODEL_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_TOOLBAR_MODEL_H_
 
 #include "base/compiler_specific.h"
 #include "base/observer_list.h"
 #include "base/prefs/pref_change_registrar.h"
@@ skipping 19 matching lines @@
 class ExtensionToolbarModel : public content::NotificationObserver,
                               public ExtensionActionAPI::Observer,
                               public ExtensionRegistryObserver,
                               public KeyedService {
  public:
   ExtensionToolbarModel(Profile* profile, ExtensionPrefs* extension_prefs);
   virtual ~ExtensionToolbarModel();
 
   // A class which is informed of changes to the model; represents the view of
   // MVC. Also used for signaling view changes such as showing extension popups.
-  // TODO(devlin): Should this really be an observer? There should probably be
-  // only one (aka a Delegate)...
+  // TODO(devlin): Should this really be an observer? It acts more like a
+  // delegate.
   class Observer {
    public:
     // An extension has been added to the toolbar and should go at |index|.
     virtual void ToolbarExtensionAdded(const Extension* extension,
                                        int index) = 0;
 
     // The given |extension| should be removed from the toolbar.
     virtual void ToolbarExtensionRemoved(const Extension* extension) = 0;
 
     // The given |extension| has been moved to |index|. |index| is the desired
     // *final* index of the extension (that is, in the adjusted order, extension
     // should be at |index|).
     virtual void ToolbarExtensionMoved(const Extension* extension,
                                        int index) = 0;
 
     // Signals that the browser action for the given |extension| has been
     // updated.
     virtual void ToolbarExtensionUpdated(const Extension* extension) = 0;
 
     // Signal the |extension| to show the popup now in the active window.
+    // If |grant_active_tab| is true, then active tab permissions should be
+    // given to the extension (only do this if this is through a user action).
     // Returns true if a popup was slated to be shown.
-    virtual bool ShowExtensionActionPopup(const Extension* extension) = 0;
+    virtual bool ShowExtensionActionPopup(const Extension* extension,
+                                          bool grant_active_tab) = 0;
 
     // Signal when the container needs to be redrawn because of a size change,
     // and when the model has finished loading.
     virtual void ToolbarVisibleCountChanged() = 0;
 
     // Signal that the model has entered or exited highlighting mode, or that
     // the extensions being highlighted have (probably*) changed. Highlighting
     // mode indicates that only a subset of the extensions are actively
     // displayed, and those extensions should be highlighted for extra emphasis.
     // * probably, because if we are in highlight mode and receive a call to
     //   highlight a new set of extensions, we do not compare the current set
     //   with the new set (and just assume the new set is different).
     virtual void ToolbarHighlightModeChanged(bool is_highlighting) = 0;
 
+    // Returns the browser associated with the Observer.
+    virtual Browser* GetBrowser() = 0;
+
    protected:
     virtual ~Observer() {}
   };
 
   // Convenience function to get the ExtensionToolbarModel for a Profile.
   static ExtensionToolbarModel* Get(Profile* profile);
 
   // Add or remove an observer.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
@@ skipping 17 matching lines @@
 
   bool is_highlighting() const { return is_highlighting_; }
 
   // Utility functions for converting between an index into the list of
   // incognito-enabled browser actions, and the list of all browser actions.
   int IncognitoIndexToOriginal(int incognito_index);
   int OriginalIndexToIncognito(int original_index);
 
   void OnExtensionToolbarPrefChange();
 
-  // Tells observers to display a popup without granting tab permissions and
-  // returns whether the popup was slated to be shown.
-  bool ShowBrowserActionPopup(const Extension* extension);
+  // Finds the Observer associated with |browser| and tells it to display a
+  // popup for the given |extension|. If |grant_active_tab| is true, this
+  // grants active tab permissions to the |extension|; only do this because of
+  // a direct user action.
+  bool ShowExtensionActionPopup(const Extension* extension,
+                                Browser* browser,
+                                bool grant_active_tab);
 
   // Ensures that the extensions in the |extension_ids| list are visible on the
   // toolbar. This might mean they need to be moved to the front (if they are in
   // the overflow bucket).
   void EnsureVisibility(const ExtensionIdList& extension_ids);
 
   // Highlight the extensions specified by |extension_ids|. This will cause
   // the ToolbarModel to only display those extensions.
   // Highlighting mode is only entered if there is at least one extension to
   // be shown.
@@ skipping 113 matching lines @@
   base::Closure pref_change_callback_;
 
   base::WeakPtrFactory<ExtensionToolbarModel> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionToolbarModel);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_TOOLBAR_MODEL_H_