diff options
| author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-15 00:36:27 +0000 |
|---|---|---|
| committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-15 00:36:27 +0000 |
| commit | 6bf9061f137de33b450f5ae9634b8c903bf2326d (patch) | |
| tree | bf211f9108fdaafb0c065bb34d01fae62fc2e4bd /chrome/browser/extensions/installed_loader.cc | |
| parent | 5c10302fc35eff459864d872d33f0091a521c98b (diff) | |
| download | chromium_src-6bf9061f137de33b450f5ae9634b8c903bf2326d.zip chromium_src-6bf9061f137de33b450f5ae9634b8c903bf2326d.tar.gz chromium_src-6bf9061f137de33b450f5ae9634b8c903bf2326d.tar.bz2 | |
Rename extension_manifest_keys namespace to extensions::manifest_keys.
Move it to extensions/common/manifest_constants.cc.
Minorly improve packaged app + manifest version 1 error message.
BUG=162530
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/22794012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217709 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/installed_loader.cc')
| -rw-r--r-- | chrome/browser/extensions/installed_loader.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/extensions/installed_loader.cc b/chrome/browser/extensions/installed_loader.cc index 62940e1..8927c45 100644 --- a/chrome/browser/extensions/installed_loader.cc +++ b/chrome/browser/extensions/installed_loader.cc @@ -75,7 +75,8 @@ enum ExternalItemState { }; bool IsManifestCorrupt(const DictionaryValue* manifest) { - if (!manifest) return false; + if (!manifest) + return false; // Because of bug #272524 sometimes manifests got mangled in the preferences // file, one particularly bad case resulting in having both a background page @@ -83,10 +84,8 @@ bool IsManifestCorrupt(const DictionaryValue* manifest) { // manifest from the extension to fix this. const Value* background_page; const Value* background_scripts; - return manifest->Get(extension_manifest_keys::kBackgroundPage, - &background_page) && - manifest->Get(extension_manifest_keys::kBackgroundScripts, - &background_scripts); + return manifest->Get(manifest_keys::kBackgroundPage, &background_page) && + manifest->Get(manifest_keys::kBackgroundScripts, &background_scripts); } ManifestReloadReason ShouldReloadExtensionManifest(const ExtensionInfo& info) { |