Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6880)

Unified Diff: chrome/browser/extensions/extension_toolbar_model.cc

Issue 10443105: Take 2 at implementing activeTab. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: a unit test Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_toolbar_model.cc
diff --git a/chrome/browser/extensions/extension_toolbar_model.cc b/chrome/browser/extensions/extension_toolbar_model.cc
index aeea4faee9756221df897076b99f00ebcd8f0c07..6a36fe592e19aa00cbd4895d7bdbfa075bad2add 100644
--- a/chrome/browser/extensions/extension_toolbar_model.cc
+++ b/chrome/browser/extensions/extension_toolbar_model.cc
@@ -7,6 +7,7 @@
#include "chrome/browser/extensions/extension_browser_event_router.h"
#include "chrome/browser/extensions/extension_prefs.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_tab_helper.h"
#include "chrome/browser/extensions/extension_tab_util.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
@@ -95,6 +96,9 @@ ExtensionToolbarModel::Action ExtensionToolbarModel::ExecuteBrowserAction(
if (tab_id < 0)
return ACTION_NONE;
+ tab_contents->extension_tab_helper()->active_tab_permission_manager()->Grant(
Aaron Boodman 2012/06/06 01:03:13 I hate these kind of method names, but it might be
not at google - send to devlin 2012/06/06 07:38:40 yeah I hate Maybe too. So vague, and always requir
+ extension);
+
ExtensionAction* browser_action = extension->browser_action();
if (browser_action->HasPopup(tab_id)) {
if (popup_url_out)

Powered by Google App Engine
This is Rietveld 408576698