summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-19 17:26:23 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-19 17:26:23 +0000
commit9bfac759ae8db48965e426fb226a948ce5f6234f (patch)
tree2e6ee8eaab2b987a97faa886b8855da19bc61d6e /chrome/browser/extensions
parent0799ce51ae59678cdb4b3c0fcd1b324b04551cc3 (diff)
downloadchromium_src-9bfac759ae8db48965e426fb226a948ce5f6234f.zip
chromium_src-9bfac759ae8db48965e426fb226a948ce5f6234f.tar.gz
chromium_src-9bfac759ae8db48965e426fb226a948ce5f6234f.tar.bz2
extensions: test if the external provider exists before reading it
Cut down on some WARNING spam in the common case of no file. BUG=41839 Review URL: http://codereview.chromium.org/1618031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44922 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/external_pref_extension_provider.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/extensions/external_pref_extension_provider.cc b/chrome/browser/extensions/external_pref_extension_provider.cc
index c51f4f2..5fe39b4 100644
--- a/chrome/browser/extensions/external_pref_extension_provider.cc
+++ b/chrome/browser/extensions/external_pref_extension_provider.cc
@@ -23,8 +23,12 @@ ExternalPrefExtensionProvider::ExternalPrefExtensionProvider() {
PathService::Get(app::DIR_EXTERNAL_EXTENSIONS, &json_file);
json_file = json_file.Append(FILE_PATH_LITERAL("external_extensions.json"));
- JSONFileValueSerializer serializer(json_file);
- SetPreferences(&serializer);
+ if (file_util::PathExists(json_file)) {
+ JSONFileValueSerializer serializer(json_file);
+ SetPreferences(&serializer);
+ } else {
+ prefs_.reset(new DictionaryValue());
+ }
}
ExternalPrefExtensionProvider::~ExternalPrefExtensionProvider() {