chrome/common/extensions/manifest_handlers/icons_handler.cc - Issue 23744004: Move the rest of extension_manifest_constants to top-level 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/manifest_handlers/icons_handler.cc

Issue 23744004: Move the rest of extension_manifest_constants to top-level extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Latest master Created 7 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/common/extensions/manifest_handlers/content_scripts_manifest_unittest.cc ('k') | chrome/common/extensions/manifest_handlers/kiosk_enabled_info.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/manifest_handlers/icons_handler.cc

diff --git a/chrome/common/extensions/manifest_handlers/icons_handler.cc b/chrome/common/extensions/manifest_handlers/icons_handler.cc

index a3742492f0af87246668ef160de0f413c11d97c4..70b66ad0aed510f7b0c53431df73713e957930f0 100644

--- a/chrome/common/extensions/manifest_handlers/icons_handler.cc

+++ b/chrome/common/extensions/manifest_handlers/icons_handler.cc

@@ -12,8 +12,8 @@

#include "base/values.h"

#include "chrome/common/extensions/extension.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 "extensions/common/manifest_constants.h"

#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

#include "third_party/skia/include/core/SkBitmap.h"

@@ -76,7 +76,7 @@ bool IconsHandler::Parse(Extension* extension, string16* error) {

scoped_ptr<IconsInfo> icons_info(new IconsInfo);

const base::DictionaryValue* icons_dict = NULL;

if (!extension->manifest()->GetDictionary(keys::kIcons, &icons_dict)) {

- *error = ASCIIToUTF16(extension_manifest_errors::kInvalidIcons);

+ *error = ASCIIToUTF16(manifest_errors::kInvalidIcons);

return false;

}