diff options
author | avayvod@google.com <avayvod@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-01 14:55:22 +0000 |
---|---|---|
committer | avayvod@google.com <avayvod@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-01 14:55:22 +0000 |
commit | 28e139dac3b7ba085e04bcc2d5c79e09cc69527e (patch) | |
tree | a8e1ebceac142f688fae997fc9177a040ec76539 /chrome/browser/chromeos/login/login_manager_view.h | |
parent | a194778a0ca68d586b29123025ba10eef889faed (diff) | |
download | chromium_src-28e139dac3b7ba085e04bcc2d5c79e09cc69527e.zip chromium_src-28e139dac3b7ba085e04bcc2d5c79e09cc69527e.tar.gz chromium_src-28e139dac3b7ba085e04bcc2d5c79e09cc69527e.tar.bz2 |
Separated wizard and screens from actual views.
Removed --login-screen switch and unused files.
Implemented loading of mobile account creation gaia page.
BUG=None
TEST=If user logged in at least once, login screen should appear on startup.
Otherwise network selection screen should appear first. All the rest should
work as usual.
Review URL: http://codereview.chromium.org/650141
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40274 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/login/login_manager_view.h')
-rw-r--r-- | chrome/browser/chromeos/login/login_manager_view.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/chrome/browser/chromeos/login/login_manager_view.h b/chrome/browser/chromeos/login/login_manager_view.h index b387af5..5dfbe50 100644 --- a/chrome/browser/chromeos/login/login_manager_view.h +++ b/chrome/browser/chromeos/login/login_manager_view.h @@ -9,13 +9,12 @@ #include "base/scoped_ptr.h" #include "chrome/browser/chromeos/login/authenticator.h" #include "chrome/browser/chromeos/login/login_status_consumer.h" -#include "chrome/browser/chromeos/login/wizard_screen.h" #include "chrome/browser/chromeos/version_loader.h" #include "views/accelerator.h" #include "views/controls/button/button.h" #include "views/controls/textfield/textfield.h" +#include "views/view.h" #include "views/widget/widget_gtk.h" -#include "views/window/window_delegate.h" namespace chromeos { class ScreenObserver; @@ -26,16 +25,14 @@ class Label; class NativeButton; } // namespace views -class LoginManagerView : public LoginStatusConsumer, - public WizardScreen, - public views::WindowDelegate, +class LoginManagerView : public views::View, + public LoginStatusConsumer, public views::Textfield::Controller, public views::ButtonListener { public: explicit LoginManagerView(chromeos::ScreenObserver* observer); virtual ~LoginManagerView(); - // WizardScreen implementation: void Init(); void UpdateLocalizedStrings(); |