chrome/common/extensions/api/extension_action/page_action_handler.cc - Issue 12618009: Move SystemIndicator parsing out of Extension class

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/common/extensions/api/extension_action/page_action_handler.cc

Issue 12618009: Move SystemIndicator parsing out of Extension class (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

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

« chrome/common/extensions/api/extension_action/action_info.cc ('K') | « chrome/common/extensions/api/extension_action/browser_action_handler.cc ('k') | chrome/common/extensions/api/extension_action/script_badge_handler.cc » ('j') | chrome/common/extensions/api/system_indicator/system_indicator_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/api/extension_action/page_action_handler.cc

diff --git a/chrome/common/extensions/api/extension_action/page_action_handler.cc b/chrome/common/extensions/api/extension_action/page_action_handler.cc

index ae5cc02ab22822114d5bc16a00bd0f8c9ac2976d..136693b444f5f2527660dc8c879a6c950ba211a2 100644

--- a/chrome/common/extensions/api/extension_action/page_action_handler.cc

+++ b/chrome/common/extensions/api/extension_action/page_action_handler.cc

@@ -10,7 +10,6 @@

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

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

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

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

#include "grit/generated_resources.h"

namespace keys = extension_manifest_keys;

@@ -59,8 +58,7 @@ bool PageActionHandler::Parse(Extension* extension, string16* error) {

// If page_action_value is not NULL, then there was a valid page action.

if (page_action_value) {

- page_action_info = manifest_handler_helpers::LoadActionInfo(

- extension, page_action_value, error);

+ page_action_info = ActionInfo::Load(extension, page_action_value, error);

if (!page_action_info)

return false; // Failed to parse page action definition.

}