chrome/common/extensions/api/extension_action/browser_action_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/api/extension_action/browser_action_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/api/extension_action/action_info.cc ('k') | chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.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 41001cca8ab9158b26e0ce7d0d5583d46a24ad7c..0f3efb7f6d1b2b8d2d7fdbf56d7d6f859ac16a17 100644

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

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

@@ -10,9 +10,9 @@

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

#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/feature_switch.h"

#include "extensions/common/manifest.h"

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

#include "grit/generated_resources.h"

namespace extensions {

@@ -28,7 +28,7 @@ bool BrowserActionHandler::Parse(Extension* extension,

const base::DictionaryValue* dict = NULL;

if (!extension->manifest()->GetDictionary(

manifest_keys::kBrowserAction, &dict)) {

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

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

return false;

}