chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc - Issue 10911300: Move ExtensionAction from common/ to browser/.

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

Unified Diff: chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc

Issue 10911300: Move ExtensionAction from common/ to browser/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: proof of concept 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/extension_action/extension_browser_actions_api.h ('k') | chrome/browser/extensions/api/extension_action/page_action_apitest.cc » ('j') | chrome/browser/extensions/extension_action.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc

diff --git a/chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc b/chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc

index eff7b16302a4dd324f1e3e58ddbd2e124abf38f9..680ef18b1b019309ed2afd80060c442c00529fb3 100644

--- a/chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc

+++ b/chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc

@@ -8,15 +8,15 @@

#include "base/string_number_conversions.h"

#include "chrome/browser/extensions/api/extension_action/extension_page_actions_api_constants.h"

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

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

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

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

#include "chrome/browser/extensions/location_bar_controller.h"

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

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

#include "chrome/browser/ui/browser_list.h"

#include "chrome/browser/ui/tab_contents/tab_contents.h"

#include "chrome/common/extensions/extension.h"

-#include "chrome/common/extensions/extension_action.h"

#include "chrome/common/extensions/extension_error_utils.h"

#include "content/public/browser/navigation_entry.h"

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

@@ -64,7 +64,7 @@ bool PageActionsFunction::SetPageActionEnabled(bool enable) {

}

- ExtensionAction* page_action = GetExtension()->page_action();

+ ExtensionAction* page_action = GetPageAction(profile(), *GetExtension());

if (!page_action) {

error_ = kNoPageActionError;

return false;