diff options
author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-30 13:32:03 +0000 |
---|---|---|
committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-30 13:32:03 +0000 |
commit | 3bdd290217f0b6b1e7c40d642314d5ff9b4d2e7f (patch) | |
tree | 13ba176080a673964fd9a1ba0157396609dd71f3 /views/ime | |
parent | 98d79a23f06d0ea05d1d760e5beddb9426b6a3eb (diff) | |
download | chromium_src-3bdd290217f0b6b1e7c40d642314d5ff9b4d2e7f.zip chromium_src-3bdd290217f0b6b1e7c40d642314d5ff9b4d2e7f.tar.gz chromium_src-3bdd290217f0b6b1e7c40d642314d5ff9b4d2e7f.tar.bz2 |
Initialize InputMethodBase after initializing the platforms.
InputMethodBase::Init does things (e.g. FocusedViewDidChange etc.) that can
expect that the platform specific code has already been initialized. So
initialize the platforms first.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7281025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91126 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/ime')
-rw-r--r-- | views/ime/input_method_gtk.cc | 4 | ||||
-rw-r--r-- | views/ime/input_method_ibus.cc | 4 | ||||
-rw-r--r-- | views/ime/input_method_win.cc | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/views/ime/input_method_gtk.cc b/views/ime/input_method_gtk.cc index 07da18f..b55ccb9 100644 --- a/views/ime/input_method_gtk.cc +++ b/views/ime/input_method_gtk.cc @@ -55,8 +55,6 @@ InputMethodGtk::~InputMethodGtk() { } void InputMethodGtk::Init(Widget* widget) { - InputMethodBase::Init(widget); - DCHECK(GTK_IS_WIDGET(widget->GetNativeView())); widget_realize_id_ = @@ -94,6 +92,8 @@ void InputMethodGtk::Init(Widget* widget) { // Set client window if the widget is already realized. OnWidgetRealize(widget->GetNativeView()); + + InputMethodBase::Init(widget); } void InputMethodGtk::OnFocus() { diff --git a/views/ime/input_method_ibus.cc b/views/ime/input_method_ibus.cc index 4543cef..7fe3e61 100644 --- a/views/ime/input_method_ibus.cc +++ b/views/ime/input_method_ibus.cc @@ -337,8 +337,6 @@ void InputMethodIBus::OnBlur() { } void InputMethodIBus::Init(Widget* widget) { - InputMethodBase::Init(widget); - // Initializes the connection to ibus daemon. It may happen asynchronously, // and as soon as the connection is established, the |context_| will be // created automatically. @@ -354,6 +352,8 @@ void InputMethodIBus::Init(Widget* widget) { // case, we will not get "connected" signal. if (ibus_bus_is_connected(bus)) CreateContext(); + + InputMethodBase::Init(widget); } void InputMethodIBus::DispatchKeyEvent(const KeyEvent& key) { diff --git a/views/ime/input_method_win.cc b/views/ime/input_method_win.cc index f720f05..637a069 100644 --- a/views/ime/input_method_win.cc +++ b/views/ime/input_method_win.cc @@ -25,10 +25,10 @@ InputMethodWin::~InputMethodWin() { } void InputMethodWin::Init(Widget* widget) { - InputMethodBase::Init(widget); - // Gets the initial input locale and text direction information. OnInputLangChange(0, 0); + + InputMethodBase::Init(widget); } void InputMethodWin::OnFocus() { |