Use input method to control visibility of virtual keyboard

chrome/browser/ui/touch/frame/touch_browser_frame_view.h

Index: chrome/browser/ui/touch/frame/touch_browser_frame_view.h
diff --git a/chrome/browser/ui/touch/frame/touch_browser_frame_view.h b/chrome/browser/ui/touch/frame/touch_browser_frame_view.h
index a680fbc603eb9dbe809e6334aa48b9e2fee951f5..3f1ef208ac4575a15bf6f2102f4e9c6ed67a54bf 100644
--- a/chrome/browser/ui/touch/frame/touch_browser_frame_view.h
+++ b/chrome/browser/ui/touch/frame/touch_browser_frame_view.h
@@ -6,12 +6,11 @@
 #define CHROME_BROWSER_UI_TOUCH_FRAME_TOUCH_BROWSER_FRAME_VIEW_H_
 #pragma once
 
-#include "chrome/browser/tabs/tab_strip_model_observer.h"
 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "ui/base/animation/animation_delegate.h"
-#include "views/focus/focus_manager.h"
+#include "views/ime/input_method.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/input_method_library.h"
@@ -29,12 +28,11 @@ class SlideAnimation;
 
 class TouchBrowserFrameView
     : public OpaqueBrowserFrameView,
-      public views::FocusChangeListener,
-      public TabStripModelObserver,
 #if defined(OS_CHROMEOS)
       public chromeos::InputMethodLibrary::VirtualKeyboardObserver,
 #endif
-      public ui::AnimationDelegate {
+      public ui::AnimationDelegate,
+      public views::TextInputTypeChangedListener {
  public:
   enum VirtualKeyboardType {
     NONE,
@@ -55,10 +53,6 @@ class TouchBrowserFrameView
   // Overridden from OpaqueBrowserFrameView
   virtual void Layout();
 
-  // views::FocusChangeListener implementation
-  virtual void FocusWillChange(views::View* focused_before,
-                               views::View* focused_now);
-
 #if defined(OS_CHROMEOS)
   // InputMethodLibrary::VirtualKeyboardObserver implementation.
   virtual void VirtualKeyboardChanged(
@@ -74,19 +68,12 @@ class TouchBrowserFrameView
 
  private:
   virtual void InitVirtualKeyboard();
+  void UpdateKeyboard(ui::TextInputType type);
   virtual void UpdateKeyboardAndLayout(bool should_show_keyboard);
-  virtual VirtualKeyboardType DecideKeyboardStateForView(views::View* view);
 
   // Overridden from views::View
   virtual bool HitTest(const gfx::Point& point) const OVERRIDE;
 
-  // Overrridden from TabStripModelObserver.
-  virtual void ActiveTabChanged(TabContentsWrapper* old_contents,
-                                TabContentsWrapper* new_contents,
-                                int index,
-                                bool user_gesture);
-  virtual void TabStripEmpty();
-
   // Overridden from NotificationObserver.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
@@ -96,6 +83,9 @@ class TouchBrowserFrameView
   virtual void AnimationProgressed(const ui::Animation* animation);
   virtual void AnimationEnded(const ui::Animation* animation);
 
+  // Overridden from view::TextInputTypeChangedListener:
+  virtual void TextInputTypeChanged(views::View* view, ui::TextInputType type);
+
   bool keyboard_showing_;
   int keyboard_height_;
   bool focus_listener_added_;