A keyboard widget that manages itself (the animation and all that).

chrome/browser/chromeos/login/touch_login_view.cc

Index: chrome/browser/chromeos/login/touch_login_view.cc
diff --git a/chrome/browser/chromeos/login/touch_login_view.cc b/chrome/browser/chromeos/login/touch_login_view.cc
index 67d5aa1de276f039756a530da7f0573ac8b373d5..c6011ce8e8379b68d0870dbf167ed32fce8ddf59 100644
--- a/chrome/browser/chromeos/login/touch_login_view.cc
+++ b/chrome/browser/chromeos/login/touch_login_view.cc
@@ -4,185 +4,18 @@
 
 #include "chrome/browser/chromeos/login/touch_login_view.h"
 
-#include "chrome/browser/renderer_host/render_widget_host_view_views.h"
-#include "chrome/browser/ui/touch/frame/keyboard_container_view.h"
-#include "chrome/browser/ui/views/tab_contents/tab_contents_view_touch.h"
-#include "chrome/browser/ui/views/dom_view.h"
-#include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/notification_service.h"
-#include "ui/base/animation/slide_animation.h"
-#include "ui/gfx/transform.h"
-#include "views/controls/textfield/textfield.h"
-#include "views/widget/widget.h"
-
-namespace {
-
-const char kViewClassName[] = "browser/chromeos/login/TouchLoginView";
-const int kDefaultKeyboardHeight = 300;
-const int kKeyboardSlideDuration = 300;  // In milliseconds
-
-PropertyAccessor<bool>* GetFocusedStateAccessor() {
-  static PropertyAccessor<bool> state;
-  return &state;
-}
-
-bool TabContentsHasFocus(const TabContents* contents) {
-  views::View* view = static_cast<TabContentsViewTouch*>(contents->view());
-  return view->Contains(view->GetFocusManager()->GetFocusedView());
-}
-
-}  // namespace
+#include "chrome/browser/ui/touch/keyboard/keyboard_manager.h"
 
 namespace chromeos {
 
 // TouchLoginView public: ------------------------------------------------------
 
 TouchLoginView::TouchLoginView()
-    : WebUILoginView(),
-      keyboard_showing_(false),
-      keyboard_height_(kDefaultKeyboardHeight),
-      focus_listener_added_(false),
-      keyboard_(NULL) {
+    : WebUILoginView() {
+  KeyboardManager::GetInstance();

[sadrul, 2011/07/05 06:03:38]

Perhaps this can just be done in WebUILoginView with an ifdef, so we can remove
TouchLoginView?

[bryeung, 2011/07/05 14:23:13]

That sounds better to me: seems silly to be subclassing for this single line
now.

 }
 
 TouchLoginView::~TouchLoginView() {
 }
 
-void TouchLoginView::Init() {
-  WebUILoginView::Init();
-  InitVirtualKeyboard();
-
-  registrar_.Add(this,
-                 NotificationType::FOCUS_CHANGED_IN_PAGE,
-                 NotificationService::AllSources());
-  registrar_.Add(this,
-                 NotificationType::TAB_CONTENTS_DESTROYED,
-                 NotificationService::AllSources());
-}
-
-std::string TouchLoginView::GetClassName() const {
-  return kViewClassName;
-}
-
-void TouchLoginView::FocusWillChange(views::View* focused_before,
-                                     views::View* focused_now) {
-  VirtualKeyboardType before = DecideKeyboardStateForView(focused_before);
-  VirtualKeyboardType now = DecideKeyboardStateForView(focused_now);
-  if (before != now) {
-    // TODO(varunjain): support other types of keyboard.
-    UpdateKeyboardAndLayout(now == GENERIC);
-  }
-}
-
-// TouchLoginView protected: ---------------------------------------------------
-
-void TouchLoginView::Layout() {
-  WebUILoginView::Layout();
-  if (!keyboard_)
-    return;
-
-  // We are not resizing the DOMView here, so the keyboard is going to occlude
-  // the login screen partially. It is the responsibility of the UX layer to
-  // handle this.
-
-  // Lastly layout the keyboard
-  bool display_keyboard = (keyboard_showing_ || animation_->is_animating());
-  keyboard_->SetVisible(display_keyboard);
-  gfx::Rect keyboard_bounds = bounds();
-  int keyboard_height = display_keyboard ? keyboard_height_ : 0;
-  keyboard_bounds.set_y(keyboard_bounds.height() - keyboard_height);
-  keyboard_bounds.set_height(keyboard_height);
-  keyboard_->SetBoundsRect(keyboard_bounds);
-}
-
-// TouchLoginView private: -----------------------------------------------------
-
-void TouchLoginView::InitVirtualKeyboard() {
-  keyboard_ = new KeyboardContainerView(profile_, NULL);
-  keyboard_->SetVisible(false);
-  AddChildView(keyboard_);
-
-  animation_.reset(new ui::SlideAnimation(this));
-  animation_->SetTweenType(ui::Tween::LINEAR);
-  animation_->SetSlideDuration(kKeyboardSlideDuration);
-}
-
-void TouchLoginView::UpdateKeyboardAndLayout(bool should_show_keyboard) {
-  DCHECK(keyboard_);
-  if (should_show_keyboard == keyboard_showing_)
-    return;
-  keyboard_showing_ = should_show_keyboard;
-  if (keyboard_showing_) {
-    ui::Transform transform;
-    transform.SetTranslateY(-keyboard_height_);
-    keyboard_->SetTransform(transform);
-    Layout();
-    animation_->Show();
-  } else {
-    ui::Transform transform;
-    keyboard_->SetTransform(transform);
-    animation_->Hide();
-    Layout();
-  }
-}
-
-TouchLoginView::VirtualKeyboardType
-    TouchLoginView::DecideKeyboardStateForView(views::View* view) {
-  if (!view)
-    return NONE;
-
-  std::string cname = view->GetClassName();
-  if (cname == views::Textfield::kViewClassName) {
-    return GENERIC;
-  } else if (cname == RenderWidgetHostViewViews::kViewClassName) {
-    TabContents* contents = webui_login_->tab_contents();
-    bool* editable = contents ? GetFocusedStateAccessor()->GetProperty(
-        contents->property_bag()) : NULL;
-    if (editable && *editable)
-      return GENERIC;
-  }
-  return NONE;
-}
-
-void TouchLoginView::Observe(NotificationType type,
-                             const NotificationSource& source,
-                             const NotificationDetails& details) {
-  if (type == NotificationType::FOCUS_CHANGED_IN_PAGE) {
-    // Only modify the keyboard state if the currently active tab sent the
-    // notification.
-    const TabContents* current_tab = webui_login_->tab_contents();
-    TabContents* source_tab = Source<TabContents>(source).ptr();
-    const bool editable = *Details<const bool>(details).ptr();
-
-    if (current_tab == source_tab && TabContentsHasFocus(source_tab))
-      UpdateKeyboardAndLayout(editable);
-
-    // Save the state of the focused field so that the keyboard visibility
-    // can be determined after tab switching.
-    GetFocusedStateAccessor()->SetProperty(
-        source_tab->property_bag(), editable);
-  } else if (type == NotificationType::TAB_CONTENTS_DESTROYED) {
-    GetFocusedStateAccessor()->DeleteProperty(
-        Source<TabContents>(source).ptr()->property_bag());
-  }
-}
-
-// ui::AnimationDelegate implementation ----------------------------------------
-
-void TouchLoginView::AnimationProgressed(const ui::Animation* anim) {
-  ui::Transform transform;
-  transform.SetTranslateY(
-      ui::Tween::ValueBetween(anim->GetCurrentValue(), keyboard_height_, 0));
-  keyboard_->SetTransform(transform);
-}
-
-void TouchLoginView::AnimationEnded(const ui::Animation* animation) {
-  if (keyboard_showing_) {
-    Layout();
-  } else {
-    // Notify the keyboard that it is hidden now.
-    keyboard_->SetVisible(false);
-  }
-}
-
 }  // namespace chromeos