diff options
author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-15 06:08:18 +0000 |
---|---|---|
committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-15 06:08:18 +0000 |
commit | bc3a8ba32db8fab0457a8b1ea8ec043ef27ff7ef (patch) | |
tree | 69dc37e504f2c2e11e300c92beff4a920a8c3e16 /chrome | |
parent | 4101aebea15c3b1411a017a19f1df97fd2a4ffcb (diff) | |
download | chromium_src-bc3a8ba32db8fab0457a8b1ea8ec043ef27ff7ef.zip chromium_src-bc3a8ba32db8fab0457a8b1ea8ec043ef27ff7ef.tar.gz chromium_src-bc3a8ba32db8fab0457a8b1ea8ec043ef27ff7ef.tar.bz2 |
Stop emitting a bogus error message from GetHardwareInputMethodId().
As described in the comment in the code, not having this setting
in Local State is totally fine.
TEST=chromium-os:10964
BUG=confirm that the error message doesn't appear on a netbook without startup_manifest.json.
Review URL: http://codereview.chromium.org/6516005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/browser/chromeos/input_method/input_method_util.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc index aa76e80..e31f2da 100644 --- a/chrome/browser/chromeos/input_method/input_method_util.cc +++ b/chrome/browser/chromeos/input_method/input_method_util.cc @@ -611,7 +611,9 @@ std::string GetHardwareInputMethodId() { g_browser_process->local_state()->GetString( prefs::kHardwareKeyboardLayout); if (input_method_id.empty()) { - LOG(ERROR) << "Hardware keyboard is not found (not yet stored?)"; + // This is totally fine if it's empty. The hardware keyboard layout is + // not stored if startup_manifest.json (OEM customization data) is not + // present (ex. Cr48 doen't have that file). return GetFallbackInputMethodDescriptor().id; } return input_method_id; |