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

Side by Side Diff: chrome/browser/extensions/page_action_controller.cc

Issue 10880064: Make extension commands grant the activeTab permission. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments Created 8 years, 3 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/page_action_controller.h" 5 #include "chrome/browser/extensions/page_action_controller.h"
6 6
7 #include "chrome/browser/extensions/browser_event_router.h" 7 #include "chrome/browser/extensions/browser_event_router.h"
8 #include "chrome/browser/extensions/extension_service.h" 8 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/browser/extensions/extension_system.h" 9 #include "chrome/browser/extensions/extension_system.h"
10 #include "chrome/browser/extensions/tab_helper.h" 10 #include "chrome/browser/extensions/tab_helper.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 if (!service) 47 if (!service)
48 return ACTION_NONE; 48 return ACTION_NONE;
49 49
50 const Extension* extension = service->extensions()->GetByID(extension_id); 50 const Extension* extension = service->extensions()->GetByID(extension_id);
51 CHECK(extension); 51 CHECK(extension);
52 ExtensionAction* page_action = extension->page_action(); 52 ExtensionAction* page_action = extension->page_action();
53 CHECK(page_action); 53 CHECK(page_action);
54 int tab_id = ExtensionTabUtil::GetTabId(web_contents()); 54 int tab_id = ExtensionTabUtil::GetTabId(web_contents());
55 55
56 extensions::TabHelper::FromWebContents(web_contents())-> 56 extensions::TabHelper::FromWebContents(web_contents())->
57 active_tab_permission_manager()->GrantIfRequested(extension); 57 active_tab_permission_granter()->GrantIfRequested(extension);
58 58
59 switch (mouse_button) { 59 switch (mouse_button) {
60 case 1: // left 60 case 1: // left
61 case 2: // middle 61 case 2: // middle
62 if (page_action->HasPopup(tab_id)) 62 if (page_action->HasPopup(tab_id))
63 return ACTION_SHOW_POPUP; 63 return ACTION_SHOW_POPUP;
64 64
65 GetExtensionService()->browser_event_router()->PageActionExecuted( 65 GetExtensionService()->browser_event_router()->PageActionExecuted(
66 Profile::FromBrowserContext(web_contents()->GetBrowserContext()), 66 Profile::FromBrowserContext(web_contents()->GetBrowserContext()),
67 *page_action, 67 *page_action,
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 101
102 NotifyChange(); 102 NotifyChange();
103 } 103 }
104 104
105 ExtensionService* PageActionController::GetExtensionService() const { 105 ExtensionService* PageActionController::GetExtensionService() const {
106 TabContents* tab_contents = TabContents::FromWebContents(web_contents()); 106 TabContents* tab_contents = TabContents::FromWebContents(web_contents());
107 return ExtensionSystem::Get(tab_contents->profile())->extension_service(); 107 return ExtensionSystem::Get(tab_contents->profile())->extension_service();
108 } 108 }
109 109
110 } // namespace extensions 110 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/menu_manager.cc ('k') | chrome/browser/extensions/script_badge_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698