diff options
| author | yusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-04 15:06:31 +0000 |
|---|---|---|
| committer | yusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-04 15:06:31 +0000 |
| commit | 850731906105bdcf4a0c882fb5354a5711b793b7 (patch) | |
| tree | 5fc80448f56e72b3fbd27669caf317dce01518de /chrome/browser/chromeos/input_method/xkeyboard.cc | |
| parent | 74ecc38e056dba61ec561db0804d16b8f39fcf14 (diff) | |
| download | chromium_src-850731906105bdcf4a0c882fb5354a5711b793b7.zip chromium_src-850731906105bdcf4a0c882fb5354a5711b793b7.tar.gz chromium_src-850731906105bdcf4a0c882fb5354a5711b793b7.tar.bz2 | |
Do not write redundant LOGs on Linux desktop (and unit/ui/browser tests).
BUG=chromium-os:20925
TEST=ran tests
Review URL: http://codereview.chromium.org/8111005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103889 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/input_method/xkeyboard.cc')
| -rw-r--r-- | chrome/browser/chromeos/input_method/xkeyboard.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/input_method/xkeyboard.cc b/chrome/browser/chromeos/input_method/xkeyboard.cc index a86c465..b16cc34 100644 --- a/chrome/browser/chromeos/input_method/xkeyboard.cc +++ b/chrome/browser/chromeos/input_method/xkeyboard.cc @@ -20,8 +20,8 @@ #include "base/process_util.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/input_method/input_method_util.h" +#include "chrome/browser/chromeos/system/runtime_environment.h" #include "content/browser/browser_thread.h" #include "ui/base/x/x11_util.h" @@ -96,7 +96,9 @@ const char* kCapsLockRemapped[] = { } // namespace -XKeyboard::XKeyboard(const InputMethodUtil& util) { +XKeyboard::XKeyboard(const InputMethodUtil& util) + : is_running_on_chrome_os_( + system::runtime_environment::IsRunningOnChromeOS()) { for (size_t i = 0; i < arraysize(kCustomizableKeys); ++i) { ModifierKey key = kCustomizableKeys[i]; current_modifier_map_.push_back(ModifierKeyPair(key, key)); @@ -126,9 +128,10 @@ XKeyboard::~XKeyboard() { bool XKeyboard::SetLayoutInternal(const std::string& layout_name, const ModifierMap& modifier_map, bool force) { - if (!CrosLibrary::Get()->EnsureLoaded()) { - // We should not try to change a layout inside ui_tests. - return false; + if (!is_running_on_chrome_os_) { + // We should not try to change a layout on Linux or inside ui_tests. Just + // return true. + return true; } const std::string layout_to_set = CreateFullXkbLayoutName( |