Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_WEBUI_SCREEN_LOCKER_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WEBUI_SCREEN_LOCKER_H_ |
| 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_WEBUI_SCREEN_LOCKER_H_ | 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_WEBUI_SCREEN_LOCKER_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "ash/wm/session_state_observer.h" | 10 #include "ash/wm/session_state_observer.h" |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 66 virtual void CreateLocallyManagedUser(const string16& display_name, | 66 virtual void CreateLocallyManagedUser(const string16& display_name, |
| 67 const std::string& password) OVERRIDE; | 67 const std::string& password) OVERRIDE; |
| 68 | 68 |
| 69 virtual void CompleteLogin(const std::string& username, | 69 virtual void CompleteLogin(const std::string& username, |
| 70 const std::string& password) OVERRIDE; | 70 const std::string& password) OVERRIDE; |
| 71 virtual string16 GetConnectedNetworkName() OVERRIDE; | 71 virtual string16 GetConnectedNetworkName() OVERRIDE; |
| 72 virtual void Login(const std::string& username, | 72 virtual void Login(const std::string& username, |
| 73 const std::string& password) OVERRIDE; | 73 const std::string& password) OVERRIDE; |
| 74 virtual void LoginAsRetailModeUser() OVERRIDE; | 74 virtual void LoginAsRetailModeUser() OVERRIDE; |
| 75 virtual void LoginAsGuest() OVERRIDE; | 75 virtual void LoginAsGuest() OVERRIDE; |
| 76 virtual void OnSigninScreenReady() OVERRIDE; | |
|
bartfab (slow)
2013/02/25 16:51:23
The order of these method overrides should match t
dconnelly
2013/02/26 18:04:15
Done.
| |
| 76 virtual void MigrateUserData(const std::string& old_password) OVERRIDE; | 77 virtual void MigrateUserData(const std::string& old_password) OVERRIDE; |
| 77 virtual void LoginAsPublicAccount(const std::string& username) OVERRIDE; | 78 virtual void LoginAsPublicAccount(const std::string& username) OVERRIDE; |
| 78 virtual void OnUserSelected(const std::string& username) OVERRIDE; | 79 virtual void OnUserSelected(const std::string& username) OVERRIDE; |
| 79 virtual void OnStartEnterpriseEnrollment() OVERRIDE; | 80 virtual void OnStartEnterpriseEnrollment() OVERRIDE; |
| 80 virtual void OnStartDeviceReset() OVERRIDE; | 81 virtual void OnStartDeviceReset() OVERRIDE; |
| 81 virtual void ShowWrongHWIDScreen() OVERRIDE; | 82 virtual void ShowWrongHWIDScreen() OVERRIDE; |
| 82 virtual void ResyncUserData() OVERRIDE; | 83 virtual void ResyncUserData() OVERRIDE; |
| 83 virtual void SetDisplayEmail(const std::string& email) OVERRIDE; | 84 virtual void SetDisplayEmail(const std::string& email) OVERRIDE; |
| 84 virtual void Signout() OVERRIDE; | 85 virtual void Signout() OVERRIDE; |
| 85 | 86 |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 130 base::TimeTicks lock_time_; | 131 base::TimeTicks lock_time_; |
| 131 | 132 |
| 132 base::WeakPtrFactory<WebUIScreenLocker> weak_factory_; | 133 base::WeakPtrFactory<WebUIScreenLocker> weak_factory_; |
| 133 | 134 |
| 134 DISALLOW_COPY_AND_ASSIGN(WebUIScreenLocker); | 135 DISALLOW_COPY_AND_ASSIGN(WebUIScreenLocker); |
| 135 }; | 136 }; |
| 136 | 137 |
| 137 } // namespace chromeos | 138 } // namespace chromeos |
| 138 | 139 |
| 139 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WEBUI_SCREEN_LOCKER_H_ | 140 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_WEBUI_SCREEN_LOCKER_H_ |
| OLD | NEW |