diff options
| author | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-11 18:36:32 +0000 |
|---|---|---|
| committer | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-11 18:36:32 +0000 |
| commit | c02a42452d8b8eb2c1193cafc7e71562392e572c (patch) | |
| tree | 3f87ebefef5a85bd08dc5304ca03e76389e6a06a /chrome/browser/chromeos/preferences.cc | |
| parent | a5fdb93ec2f6dc1b33d79bb3396c0cdb35f519f6 (diff) | |
| download | chromium_src-c02a42452d8b8eb2c1193cafc7e71562392e572c.zip chromium_src-c02a42452d8b8eb2c1193cafc7e71562392e572c.tar.gz chromium_src-c02a42452d8b8eb2c1193cafc7e71562392e572c.tar.bz2 | |
Introduce a configuration layer for c/b/input_method.
This allows a number of configuration-type methods to be removed from the public interface of InputMethodManager.
BUG=None
Review URL: https://chromiumcodereview.appspot.com/11316312
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172354 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/preferences.cc')
| -rw-r--r-- | chrome/browser/chromeos/preferences.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc index 49a9553..9428fd4 100644 --- a/chrome/browser/chromeos/preferences.cc +++ b/chrome/browser/chromeos/preferences.cc @@ -14,6 +14,7 @@ #include "chrome/browser/api/prefs/pref_member.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/drive/drive_file_system_util.h" +#include "chrome/browser/chromeos/input_method/input_method_configuration.h" #include "chrome/browser/chromeos/input_method/input_method_manager.h" #include "chrome/browser/chromeos/input_method/input_method_util.h" #include "chrome/browser/chromeos/input_method/xkeyboard.h" @@ -40,7 +41,7 @@ static const char kFallbackInputMethodLocale[] = "en-US"; Preferences::Preferences() : prefs_(NULL), - input_method_manager_(input_method::InputMethodManager::GetInstance()) { + input_method_manager_(input_method::GetInputMethodManager()) { } Preferences::Preferences(input_method::InputMethodManager* input_method_manager) @@ -55,7 +56,7 @@ void Preferences::RegisterUserPrefs(PrefService* prefs) { // TODO(yusukes): Remove the runtime hack. if (base::chromeos::IsRunningOnChromeOS()) { input_method::InputMethodManager* manager = - input_method::InputMethodManager::GetInstance(); + input_method::GetInputMethodManager(); if (manager) { hardware_keyboard_id = manager->GetInputMethodUtil()->GetHardwareInputMethodId(); |