Implement initial chrome.browserAction.openPopup API.

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 15 matching lines @@
   // The action that should be taken as a result of clicking a browser action.
   enum Action {
     ACTION_NONE,
     ACTION_SHOW_POPUP,
     // Unlike LocationBarController there is no ACTION_SHOW_CONTEXT_MENU,
     // because UI implementations tend to handle this themselves at a higher
     // level.
   };
 
   // A class which is informed of changes to the model; represents the view of
   // MVC.

[Matt Perry, 2013/10/16 20:34:35]

With the new method, this class is no longer really an "observer". Probably not
worth renaming, but the comment could use changing.

[justinlin, 2013/10/16 21:16:23]

Done.

   class Observer {
    public:
     // An extension with a browser action button has been added, and should go
     // in the toolbar at |index|.
     virtual void BrowserActionAdded(const extensions::Extension* extension,
                                     int index) {}
 
     // The browser action button for |extension| should no longer show.
     virtual void BrowserActionRemoved(const extensions::Extension* extension) {}
 
     // The browser action button for |extension| has been moved to |index|.
     virtual void BrowserActionMoved(const extensions::Extension* extension,
                                     int index) {}
 
+    // The browser action button for |extension| should show the popup now if it
+    // is in the active window.
+    virtual void BrowserActionShowPopup(const extensions::Extension* extension)
+        {}
+
     // Called when the model has finished loading.
     virtual void ModelLoaded() {}
 
    protected:
     virtual ~Observer() {}
   };
 
   // Functions called by the view.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
   void MoveBrowserAction(const extensions::Extension* extension, int index);
   // Executes the browser action for an extension and returns the action that
   // the UI should perform in response.
   // |popup_url_out| will be set if the extension should show a popup, with
-  // the URL that should be shown, if non-NULL.
+  // the URL that should be shown, if non-NULL. |should_grant| controls whether
+  // the browser action should grant the page tab permissions. The showPopup API
+  // does not grant permissions.
+  Action ExecuteBrowserAction(const extensions::Extension* extension,
+                              Browser* browser,
+                              GURL* popup_url_out,
+                              bool should_grant);
   Action ExecuteBrowserAction(const extensions::Extension* extension,
                               Browser* browser,
                               GURL* popup_url_out);
   // If count == size(), this will set the visible icon count to -1, meaning
   // "show all actions".
   void SetVisibleIconCount(int count);
   // As above, a return value of -1 represents "show all actions".
   int GetVisibleIconCount() const { return visible_icon_count_; }
 
   bool extensions_initialized() const { return extensions_initialized_; }
 
   const extensions::ExtensionList& toolbar_items() const {
     return toolbar_items_;
   }
 
   // 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.
+  void ShowBrowserActionPopup(const extensions::Extension* extension);
+
  private:
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // To be called after the extension service is ready; gets loaded extensions
   // from the extension service and their saved order from the pref service
   // and constructs |toolbar_items_| from these data.
   void InitializeExtensionList();
@@ skipping 39 matching lines @@
   // For observing change of toolbar order preference by external entity (sync).
   PrefChangeRegistrar pref_change_registrar_;
   base::Closure pref_change_callback_;
 
   base::WeakPtrFactory<ExtensionToolbarModel> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionToolbarModel);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_TOOLBAR_MODEL_H_