chrome/browser/extensions/page_action_controller.cc - Issue 12298037: Revert 183123

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 12298037: Revert 183123 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1417/src/

Patch Set: Created 7 years, 10 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

« no previous file with comments | « chrome/browser/extensions/extension_function_dispatcher.h ('k') | chrome/browser/extensions/plugin_apitest.cc » ('j') | no next file with comments »

OLD	NEW
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/component_loader.h"	8 #include "chrome/browser/extensions/component_loader.h"

9 #include "chrome/browser/extensions/extension_action.h"	9 #include "chrome/browser/extensions/extension_action.h"

10 #include "chrome/browser/extensions/extension_action_manager.h"	10 #include "chrome/browser/extensions/extension_action_manager.h"

11 #include "chrome/browser/extensions/extension_service.h"	11 #include "chrome/browser/extensions/extension_service.h"

12 #include "chrome/browser/extensions/extension_system.h"	12 #include "chrome/browser/extensions/extension_system.h"

13 #include "chrome/browser/extensions/extension_tab_util.h"	13 #include "chrome/browser/extensions/extension_tab_util.h"

14 #include "chrome/browser/extensions/tab_helper.h"	14 #include "chrome/browser/extensions/tab_helper.h"

15 #include "chrome/browser/profiles/profile.h"

16 #include "chrome/browser/sessions/session_id.h"	15 #include "chrome/browser/sessions/session_id.h"

17 #include "chrome/common/chrome_notification_types.h"	16 #include "chrome/common/chrome_notification_types.h"

18 #include "chrome/common/extensions/extension_set.h"	17 #include "chrome/common/extensions/extension_set.h"

19 #include "content/public/browser/invalidate_type.h"	18 #include "content/public/browser/invalidate_type.h"

20 #include "content/public/browser/navigation_details.h"	19 #include "content/public/browser/navigation_details.h"

21 #include "content/public/browser/notification_service.h"	20 #include "content/public/browser/notification_service.h"

22 #include "content/public/browser/web_contents.h"	21 #include "content/public/browser/web_contents.h"

23	22

24 namespace extensions {	23 namespace extensions {

25	24

(...skipping 84 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
110	109

111 Profile* PageActionController::profile() const {	110 Profile* PageActionController::profile() const {

112 return Profile::FromBrowserContext(web_contents()->GetBrowserContext());	111 return Profile::FromBrowserContext(web_contents()->GetBrowserContext());

113 }	112 }

114	113

115 ExtensionService* PageActionController::GetExtensionService() const {	114 ExtensionService* PageActionController::GetExtensionService() const {

116 return ExtensionSystem::Get(profile())->extension_service();	115 return ExtensionSystem::Get(profile())->extension_service();

117 }	116 }

118	117

119 } // namespace extensions	118 } // namespace extensions

OLD	NEW