| 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;
|
| }
|
|
|
|
|