From c02a42452d8b8eb2c1193cafc7e71562392e572c Mon Sep 17 00:00:00 2001 From: "erikwright@chromium.org" Date: Tue, 11 Dec 2012 18:36:32 +0000 Subject: 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 --- .../chromeos/input_method/input_method_manager_impl.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'chrome/browser/chromeos/input_method/input_method_manager_impl.h') diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.h b/chrome/browser/chromeos/input_method/input_method_manager_impl.h index 49f4dde..ba634d5 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager_impl.h +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.h @@ -32,6 +32,12 @@ class InputMethodManagerImpl : public InputMethodManager, explicit InputMethodManagerImpl(scoped_ptr delegate); virtual ~InputMethodManagerImpl(); + // Attach IBusController, CandidateWindowController, and XKeyboard objects + // to the InputMethodManagerImpl object. You don't have to call this function + // if you attach them yourself (e.g. in unit tests) using the protected + // setters. + void Init(); + // InputMethodManager override: virtual void AddObserver(InputMethodManager::Observer* observer) OVERRIDE; virtual void AddCandidateWindowObserver( @@ -83,8 +89,6 @@ class InputMethodManagerImpl : public InputMethodManager, void SetXKeyboardForTesting(XKeyboard* xkeyboard); private: - friend class InputMethodManager; - // IBusController overrides: virtual void PropertyChanged() OVERRIDE; virtual void OnConnected() OVERRIDE; @@ -95,11 +99,6 @@ class InputMethodManagerImpl : public InputMethodManager, virtual void CandidateWindowOpened() OVERRIDE; virtual void CandidateWindowClosed() OVERRIDE; - // Attach IBusController, CandidateWindowController, and XKeyboard objects - // to the InputMethodManagerImpl object. You don't have to call this function - // if you attach them yourself (e.g. in unit tests) using the setters above. - void Init(); - // Temporarily deactivates all input methods (e.g. Chinese, Japanese, Arabic) // since they are not necessary to input a login password. Users are still // able to use/switch active keyboard layouts (e.g. US qwerty, US dvorak, -- cgit v1.1