chrome/common/extensions/api/extension_action/browser_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/browser_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

« no previous file with comments | « chrome/common/extensions/api/extension_action/action_info.cc ('k') | chrome/common/extensions/api/extension_action/page_action_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 5378b53afacd331ecfbcb13fc324d06f618a4123..26af4d4ecf8562e5aa0ee5afe5711283a6decb5b 100644

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

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

@@ -13,7 +13,6 @@

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

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

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

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

#include "grit/generated_resources.h"

namespace extensions {

@@ -33,8 +32,7 @@ bool BrowserActionHandler::Parse(Extension* extension,

return false;

}

- scoped_ptr<ActionInfo> action_info =

- manifest_handler_helpers::LoadActionInfo(extension, dict, error);

+ scoped_ptr<ActionInfo> action_info = ActionInfo::Load(extension, dict, error);

if (!action_info.get())

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

@@ -47,8 +45,7 @@ bool BrowserActionHandler::Validate(

const Extension* extension,

std::string* error,

std::vector<InstallWarning>* warnings) const {

- const ActionInfo* action =

- extensions::ActionInfo::GetBrowserActionInfo(extension);

+ const ActionInfo* action = ActionInfo::GetBrowserActionInfo(extension);

if (action && !action->default_icon.empty() &&

!extension_file_util::ValidateExtensionIconSet(

action->default_icon,