chrome/common/extensions/api/extension_action/page_action_handler.cc - Issue 229813002: Move extensions manifest IconsHandler to //extensions

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 229813002: Move extensions manifest IconsHandler to //extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: review comments (icons-handler) Created 6 years, 8 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/browser_action_handler.cc ('k') | chrome/common/extensions/chrome_manifest_handlers.cc » ('j') | no next file with comments »
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 a9d2ea8aa5389c78164e7961c474ea9dd2b69800..6c4a3b28a299babbf3f68d415f03ab9922b11334 100644

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

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

@@ -7,8 +7,8 @@

#include "base/strings/utf_string_conversions.h"

#include "base/values.h"

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

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

#include "extensions/common/extension.h"

+#include "extensions/common/file_util.h"

#include "extensions/common/manifest_constants.h"

#include "grit/generated_resources.h"

@@ -79,7 +79,7 @@ bool PageActionHandler::Validate(const Extension* extension,

const extensions::ActionInfo* action =

extensions::ActionInfo::GetPageActionInfo(extension);

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

- !extension_file_util::ValidateExtensionIconSet(

+ !file_util::ValidateExtensionIconSet(

action->default_icon,

extension,

IDS_EXTENSION_LOAD_ICON_FOR_PAGE_ACTION_FAILED,