diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-10 21:03:42 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-10 21:03:42 +0000 |
| commit | 5bd5535d7a09ace81449132ed11934b67de5989a (patch) | |
| tree | 37948c16e4236181ec18331cc3502586861a2f7f /views | |
| parent | 6d2d9816591ebcd37727b21d56aa9f586e6e492e (diff) | |
| download | chromium_src-5bd5535d7a09ace81449132ed11934b67de5989a.zip chromium_src-5bd5535d7a09ace81449132ed11934b67de5989a.tar.gz chromium_src-5bd5535d7a09ace81449132ed11934b67de5989a.tar.bz2 | |
Fix correct override to fix clang chromeos (broke in r109842).
TBR=alicet@chromium.org
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8524009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109505 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/ime/input_method_gtk.cc | 4 | ||||
| -rw-r--r-- | views/ime/input_method_gtk.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/views/ime/input_method_gtk.cc b/views/ime/input_method_gtk.cc index c50cb0e..ee1dabb 100644 --- a/views/ime/input_method_gtk.cc +++ b/views/ime/input_method_gtk.cc @@ -195,11 +195,11 @@ bool InputMethodGtk::IsActive() { return true; } -void InputMethodGtk::OnWillChangeFocus() { +void InputMethodGtk::OnWillChangeFocus(View* focused_before, View* focused) { ConfirmCompositionText(); } -void InputMethodGtk::OnDidChangeFocus() { +void InputMethodGtk::OnDidChangeFocus(View* focused_before, View* focused) { UpdateContextFocusState(); // Force to update caret bounds, in case the View thinks that the caret diff --git a/views/ime/input_method_gtk.h b/views/ime/input_method_gtk.h index a25a72a..fe323ea 100644 --- a/views/ime/input_method_gtk.h +++ b/views/ime/input_method_gtk.h @@ -38,8 +38,8 @@ class InputMethodGtk : public InputMethodBase { private: // Overridden from InputMethodBase: - virtual void OnWillChangeFocus() OVERRIDE; - virtual void OnDidChangeFocus() OVERRIDE; + virtual void OnWillChangeFocus(View* focused_before, View* focused) OVERRIDE; + virtual void OnDidChangeFocus(View* focused_before, View* focused) OVERRIDE; // Asks the client to confirm current composition text. void ConfirmCompositionText(); |