Index: chrome/browser/ui/touch/keyboard/keyboard_manager.h |
diff --git a/chrome/browser/ui/touch/keyboard/keyboard_manager.h b/chrome/browser/ui/touch/keyboard/keyboard_manager.h |
index f936787028ece437ec8ded2d6405c2e0c5776745..5c40410f16ca11cf07f5ac0e048645419e226532 100644 |
--- a/chrome/browser/ui/touch/keyboard/keyboard_manager.h |
+++ b/chrome/browser/ui/touch/keyboard/keyboard_manager.h |
@@ -8,11 +8,10 @@ |
#include "base/memory/singleton.h" |
#include "chrome/browser/extensions/extension_function_dispatcher.h" |
-#include "chrome/browser/tabs/tab_strip_model_observer.h" |
-#include "chrome/browser/ui/browser_list.h" |
#include "content/browser/tab_contents/tab_contents_observer.h" |
#include "content/common/notification_observer.h" |
#include "ui/base/animation/animation_delegate.h" |
+#include "views/ime/text_input_type_tracker.h" |
#include "views/widget/widget.h" |
#if defined(OS_CHROMEOS) |
@@ -39,13 +38,12 @@ class ExtensionHostMsg_Request_Params; |
class KeyboardManager |
: public views::Widget, |
public ui::AnimationDelegate, |
- public BrowserList::Observer, |
public TabContentsObserver, |
- public TabStripModelObserver, |
public ExtensionFunctionDispatcher::Delegate, |
#if defined(OS_CHROMEOS) |
public chromeos::input_method::InputMethodManager::VirtualKeyboardObserver, |
#endif |
+ public views::TextInputTypeObserver, |
public NotificationObserver { |
public: |
// Returns the singleton object. |
@@ -73,19 +71,13 @@ class KeyboardManager |
virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE; |
virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE; |
- // Overridden from BrowserList::Observer. |
- virtual void OnBrowserAdded(const Browser* browser) OVERRIDE; |
- virtual void OnBrowserRemoved(const Browser* browser) OVERRIDE; |
- |
// Overridden from TabContentsObserver |
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; |
void OnRequest(const ExtensionHostMsg_Request_Params& params); |
- // Overridden from TabStripModelObserver. |
- virtual void ActiveTabChanged(TabContentsWrapper* old_contents, |
- TabContentsWrapper* new_contents, |
- int index, |
- bool user_gesture); |
+ // Overridden from TextInputTypeObserver. |
+ virtual void TextInputTypeChanged(ui::TextInputType type, |
+ views::Widget *widget) OVERRIDE; |
// ExtensionFunctionDispatcher::Delegate implementation |
virtual Browser* GetBrowser() OVERRIDE; |