Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(102)

Side by Side Diff: chrome/browser/chromeos/login/lock/webui_screen_locker.h

Issue 324463003: ChromeOS login webui refactoring : Simplify login methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge with ToT Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_WEBUI_SCREEN_LOCKER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_WEBUI_SCREEN_LOCKER_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_WEBUI_SCREEN_LOCKER_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_WEBUI_SCREEN_LOCKER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ash/shell_delegate.h" 10 #include "ash/shell_delegate.h"
11 #include "ash/wm/lock_state_observer.h" 11 #include "ash/wm/lock_state_observer.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "base/time/time.h" 15 #include "base/time/time.h"
16 #include "chrome/browser/chromeos/login/lock/screen_locker_delegate.h" 16 #include "chrome/browser/chromeos/login/lock/screen_locker_delegate.h"
17 #include "chrome/browser/chromeos/login/signin_specifics.h"
17 #include "chrome/browser/chromeos/login/ui/lock_window.h" 18 #include "chrome/browser/chromeos/login/ui/lock_window.h"
18 #include "chrome/browser/chromeos/login/ui/login_display.h" 19 #include "chrome/browser/chromeos/login/ui/login_display.h"
19 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" 20 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
20 #include "chromeos/dbus/power_manager_client.h" 21 #include "chromeos/dbus/power_manager_client.h"
21 #include "content/public/browser/notification_observer.h" 22 #include "content/public/browser/notification_observer.h"
22 #include "content/public/browser/notification_registrar.h" 23 #include "content/public/browser/notification_registrar.h"
23 #include "ui/keyboard/keyboard_controller_observer.h" 24 #include "ui/keyboard/keyboard_controller_observer.h"
24 #include "ui/views/widget/widget.h" 25 #include "ui/views/widget/widget.h"
25 #include "ui/views/widget/widget_observer.h" 26 #include "ui/views/widget/widget_observer.h"
26 27
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 virtual content::WebUI* GetAssociatedWebUI() OVERRIDE; 71 virtual content::WebUI* GetAssociatedWebUI() OVERRIDE;
71 virtual void OnLockWebUIReady() OVERRIDE; 72 virtual void OnLockWebUIReady() OVERRIDE;
72 virtual void OnLockBackgroundDisplayed() OVERRIDE; 73 virtual void OnLockBackgroundDisplayed() OVERRIDE;
73 74
74 // LoginDisplay::Delegate: implementation 75 // LoginDisplay::Delegate: implementation
75 virtual void CancelPasswordChangedFlow() OVERRIDE; 76 virtual void CancelPasswordChangedFlow() OVERRIDE;
76 virtual void CreateAccount() OVERRIDE; 77 virtual void CreateAccount() OVERRIDE;
77 virtual void CompleteLogin(const UserContext& user_context) OVERRIDE; 78 virtual void CompleteLogin(const UserContext& user_context) OVERRIDE;
78 virtual base::string16 GetConnectedNetworkName() OVERRIDE; 79 virtual base::string16 GetConnectedNetworkName() OVERRIDE;
79 virtual bool IsSigninInProgress() const OVERRIDE; 80 virtual bool IsSigninInProgress() const OVERRIDE;
80 virtual void Login(const UserContext& user_context) OVERRIDE; 81 virtual void Login(const UserContext& user_context,
81 virtual void LoginAsRetailModeUser() OVERRIDE; 82 const SigninSpecifics& specifics) OVERRIDE;
82 virtual void LoginAsGuest() OVERRIDE; 83 // virtual void LoginAsRetailModeUser() OVERRIDE;
84 // virtual void LoginAsGuest() OVERRIDE;
83 virtual void MigrateUserData(const std::string& old_password) OVERRIDE; 85 virtual void MigrateUserData(const std::string& old_password) OVERRIDE;
84 virtual void LoginAsPublicAccount(const std::string& username) OVERRIDE; 86 // virtual void LoginAsPublicAccount(const std::string& username) OVERRIDE;
85 virtual void OnSigninScreenReady() OVERRIDE; 87 virtual void OnSigninScreenReady() OVERRIDE;
86 virtual void OnUserSelected(const std::string& username) OVERRIDE;
87 virtual void OnStartEnterpriseEnrollment() OVERRIDE; 88 virtual void OnStartEnterpriseEnrollment() OVERRIDE;
88 virtual void OnStartKioskEnableScreen() OVERRIDE; 89 virtual void OnStartKioskEnableScreen() OVERRIDE;
89 virtual void OnStartKioskAutolaunchScreen() OVERRIDE; 90 virtual void OnStartKioskAutolaunchScreen() OVERRIDE;
90 virtual void ShowWrongHWIDScreen() OVERRIDE; 91 virtual void ShowWrongHWIDScreen() OVERRIDE;
91 virtual void ResetPublicSessionAutoLoginTimer() OVERRIDE; 92 virtual void ResetPublicSessionAutoLoginTimer() OVERRIDE;
92 virtual void ResyncUserData() OVERRIDE; 93 virtual void ResyncUserData() OVERRIDE;
93 virtual void SetDisplayEmail(const std::string& email) OVERRIDE; 94 virtual void SetDisplayEmail(const std::string& email) OVERRIDE;
94 virtual void Signout() OVERRIDE; 95 virtual void Signout() OVERRIDE;
95 virtual void LoginAsKioskApp(const std::string& app_id,
96 bool diagnostic_mode) OVERRIDE;
97 96
98 // content::NotificationObserver (via WebUILoginView) implementation. 97 // content::NotificationObserver (via WebUILoginView) implementation.
99 virtual void Observe(int type, 98 virtual void Observe(int type,
100 const content::NotificationSource& source, 99 const content::NotificationSource& source,
101 const content::NotificationDetails& details) OVERRIDE; 100 const content::NotificationDetails& details) OVERRIDE;
102 101
103 // LockWindow::Observer implementation. 102 // LockWindow::Observer implementation.
104 virtual void OnLockWindowReady() OVERRIDE; 103 virtual void OnLockWindowReady() OVERRIDE;
105 104
106 // LockStateObserver override. 105 // LockStateObserver override.
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 gfx::Rect keyboard_bounds_; 161 gfx::Rect keyboard_bounds_;
163 162
164 base::WeakPtrFactory<WebUIScreenLocker> weak_factory_; 163 base::WeakPtrFactory<WebUIScreenLocker> weak_factory_;
165 164
166 DISALLOW_COPY_AND_ASSIGN(WebUIScreenLocker); 165 DISALLOW_COPY_AND_ASSIGN(WebUIScreenLocker);
167 }; 166 };
168 167
169 } // namespace chromeos 168 } // namespace chromeos
170 169
171 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_WEBUI_SCREEN_LOCKER_H_ 170 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_LOCK_WEBUI_SCREEN_LOCKER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698