| Index: chrome/browser/chromeos/login/touch_login_view.h
|
| diff --git a/chrome/browser/chromeos/login/touch_login_view.h b/chrome/browser/chromeos/login/touch_login_view.h
|
| index a034bcfb645c463e4c3776e914fed73d77d8e806..6be0104f4afcab00dec5a728b2de6e36d5f73b8e 100644
|
| --- a/chrome/browser/chromeos/login/touch_login_view.h
|
| +++ b/chrome/browser/chromeos/login/touch_login_view.h
|
| @@ -7,73 +7,18 @@
|
| #pragma once
|
|
|
| #include "chrome/browser/chromeos/login/webui_login_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"
|
| -
|
| -class KeyboardContainerView;
|
| -class NotificationDetails;
|
| -class NotificationSource;
|
| -
|
| -namespace ui {
|
| -class SlideAnimation;
|
| -}
|
|
|
| namespace chromeos {
|
|
|
| // Subclass of the WebUILoginView. This view adds in support for a virtual
|
| // keyboard, which appears and disappears depending if text areas have
|
| // focus. This is only build in TOUCH_UI enabled builds.
|
| -class TouchLoginView : public WebUILoginView,
|
| - public views::FocusChangeListener,
|
| - public NotificationObserver,
|
| - public ui::AnimationDelegate {
|
| +class TouchLoginView : public WebUILoginView {
|
| public:
|
| - enum VirtualKeyboardType {
|
| - NONE,
|
| - GENERIC,
|
| - URL,
|
| - };
|
| -
|
| TouchLoginView();
|
| virtual ~TouchLoginView();
|
|
|
| - // Overriden from WebUILoginView:
|
| - virtual void Init() OVERRIDE;
|
| -
|
| - // Overriden from views::Views:
|
| - virtual std::string GetClassName() const OVERRIDE;
|
| -
|
| - // Overridden from views::FocusChangeListener:
|
| - virtual void FocusWillChange(views::View* focused_before,
|
| - views::View* focused_now) OVERRIDE;
|
| -
|
| - protected:
|
| - // Overridden from views::View:
|
| - virtual void Layout() OVERRIDE;
|
| -
|
| private:
|
| - void InitVirtualKeyboard();
|
| - void UpdateKeyboardAndLayout(bool should_show_keyboard);
|
| - VirtualKeyboardType DecideKeyboardStateForView(views::View* view);
|
| -
|
| - // Overridden from NotificationObserver.
|
| - virtual void Observe(NotificationType type,
|
| - const NotificationSource& source,
|
| - const NotificationDetails& details) OVERRIDE;
|
| -
|
| - // Overridden from ui::AnimationDelegate:
|
| - virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
|
| - virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
|
| -
|
| - bool keyboard_showing_;
|
| - int keyboard_height_;
|
| - bool focus_listener_added_;
|
| - KeyboardContainerView* keyboard_;
|
| - NotificationRegistrar registrar_;
|
| -
|
| - scoped_ptr<ui::SlideAnimation> animation_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TouchLoginView);
|
| };
|
|
|