diff options
| author | rdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-12 00:53:31 +0000 |
|---|---|---|
| committer | rdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-12 00:53:31 +0000 |
| commit | 1d4d65dd6c49df9ffe0a43df0cdb6777029c2342 (patch) | |
| tree | 22a2cb7371b047afccc38d22038ec169c37acc64 | |
| parent | 03533025bcdb752258c13bbd0b0ed4b48461fb88 (diff) | |
| download | chromium_src-1d4d65dd6c49df9ffe0a43df0cdb6777029c2342.zip chromium_src-1d4d65dd6c49df9ffe0a43df0cdb6777029c2342.tar.gz chromium_src-1d4d65dd6c49df9ffe0a43df0cdb6777029c2342.tar.bz2 | |
Fix a ComponentLoader error at chrome startup.
ComponentLoader was trying to load the Virtual Keyboard even when the resources
were not loaded. Ensure this doesn't happen, so we don't throw an error.
BUG=342055
Review URL: https://codereview.chromium.org/136933006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250581 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/component_loader.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc index 6deb0ac..84ad6de 100644 --- a/chrome/browser/extensions/component_loader.cc +++ b/chrome/browser/extensions/component_loader.cc @@ -33,7 +33,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#if defined(USE_AURA) +#if defined(OS_CHROMEOS) #include "grit/keyboard_resources.h" #include "ui/keyboard/keyboard_util.h" #endif @@ -132,9 +132,6 @@ void ComponentLoader::LoadAll() { base::DictionaryValue* ComponentLoader::ParseManifest( const std::string& manifest_contents) const { - if (manifest_contents.empty()) - return NULL; - JSONStringValueSerializer serializer(manifest_contents); scoped_ptr<base::Value> manifest(serializer.Deserialize(NULL, NULL)); @@ -382,7 +379,7 @@ void ComponentLoader::AddChromeApp() { } void ComponentLoader::AddKeyboardApp() { -#if defined(USE_AURA) +#if defined(OS_CHROMEOS) Add(IDR_KEYBOARD_MANIFEST, base::FilePath(FILE_PATH_LITERAL("keyboard"))); #endif } |