Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2915)

Unified Diff: chrome/common/extensions/incognito_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
Index: chrome/common/extensions/incognito_handler.cc
diff --git a/chrome/common/extensions/incognito_handler.cc b/chrome/common/extensions/incognito_handler.cc
index 29d135483a913c296c48ea7cdccb00113e1ad9cd..24b9dd61e81453698db09d5521efd16c9f6ea7ea 100644
--- a/chrome/common/extensions/incognito_handler.cc
+++ b/chrome/common/extensions/incognito_handler.cc
@@ -8,7 +8,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_manifest_constants.h"
+#include "extensions/common/manifest_constants.h"
namespace extensions {
@@ -45,16 +45,16 @@ bool IncognitoHandler::Parse(Extension* extension, string16* error) {
bool split_mode = false;
std::string incognito_string;
if (!extension->manifest()->GetString(keys::kIncognito, &incognito_string)) {
- *error = ASCIIToUTF16(extension_manifest_errors::kInvalidIncognitoBehavior);
+ *error = ASCIIToUTF16(manifest_errors::kInvalidIncognitoBehavior);
return false;
}
- if (incognito_string == extension_manifest_values::kIncognitoSplit)
+ if (incognito_string == manifest_values::kIncognitoSplit)
split_mode = true;
- else if (incognito_string != extension_manifest_values::kIncognitoSpanning) {
+ else if (incognito_string != manifest_values::kIncognitoSpanning) {
// If incognito_string == kIncognitoSpanning, it is valid and
// split_mode remains false.
- *error = ASCIIToUTF16(extension_manifest_errors::kInvalidIncognitoBehavior);
+ *error = ASCIIToUTF16(manifest_errors::kInvalidIncognitoBehavior);
return false;
}
« no previous file with comments | « chrome/common/extensions/extension_manifest_constants.cc ('k') | chrome/common/extensions/manifest_handler_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698