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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h

Issue 491263002: UI flow rework for device reset options. Reset made available from gaia screen. Tests adapted. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ShowAndCancelTest fixed. Created 6 years, 3 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_
6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_ 6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "chrome/browser/chromeos/login/screens/core_oobe_actor.h"
13 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h" 14 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
14 #include "net/base/net_errors.h" 15 #include "net/base/net_errors.h"
15 16
16 namespace policy { 17 namespace policy {
17 class ConsumerManagementService; 18 class ConsumerManagementService;
18 } 19 }
19 20
20 namespace chromeos { 21 namespace chromeos {
21 22
22 class SigninScreenHandler; 23 class SigninScreenHandler;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 class GaiaScreenHandler : public BaseScreenHandler { 55 class GaiaScreenHandler : public BaseScreenHandler {
55 public: 56 public:
56 enum FrameState { 57 enum FrameState {
57 FRAME_STATE_UNKNOWN = 0, 58 FRAME_STATE_UNKNOWN = 0,
58 FRAME_STATE_LOADING, 59 FRAME_STATE_LOADING,
59 FRAME_STATE_LOADED, 60 FRAME_STATE_LOADED,
60 FRAME_STATE_ERROR 61 FRAME_STATE_ERROR
61 }; 62 };
62 63
63 GaiaScreenHandler( 64 GaiaScreenHandler(
65 CoreOobeActor* core_oobe_actor,
64 const scoped_refptr<NetworkStateInformer>& network_state_informer, 66 const scoped_refptr<NetworkStateInformer>& network_state_informer,
65 policy::ConsumerManagementService* consumer_management); 67 policy::ConsumerManagementService* consumer_management);
66 virtual ~GaiaScreenHandler(); 68 virtual ~GaiaScreenHandler();
67 69
68 void LoadGaia(const GaiaContext& context); 70 void LoadGaia(const GaiaContext& context);
69 void UpdateGaia(const GaiaContext& context); 71 void UpdateGaia(const GaiaContext& context);
70 72
71 // Sends request to reload Gaia. If |force_reload| is true, request 73 // Sends request to reload Gaia. If |force_reload| is true, request
72 // will be sent in any case, otherwise it will be sent only when Gaia is 74 // will be sent in any case, otherwise it will be sent only when Gaia is
73 // not loading right now. 75 // not loading right now.
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 169
168 // Latest Gaia frame error. 170 // Latest Gaia frame error.
169 net::Error frame_error_; 171 net::Error frame_error_;
170 172
171 // Network state informer used to keep signin screen up. 173 // Network state informer used to keep signin screen up.
172 scoped_refptr<NetworkStateInformer> network_state_informer_; 174 scoped_refptr<NetworkStateInformer> network_state_informer_;
173 175
174 // Consumer management service for checking if enrollment is in progress. 176 // Consumer management service for checking if enrollment is in progress.
175 policy::ConsumerManagementService* consumer_management_; 177 policy::ConsumerManagementService* consumer_management_;
176 178
179 CoreOobeActor* core_oobe_actor_;
180
177 // Email to pre-populate with. 181 // Email to pre-populate with.
178 std::string populated_email_; 182 std::string populated_email_;
179 183
180 // Emails of the users, whose passwords have recently been changed. 184 // Emails of the users, whose passwords have recently been changed.
181 std::set<std::string> password_changed_for_; 185 std::set<std::string> password_changed_for_;
182 186
183 // True if dns cache cleanup is done. 187 // True if dns cache cleanup is done.
184 bool dns_cleared_; 188 bool dns_cleared_;
185 189
186 // True if DNS cache task is already running. 190 // True if DNS cache task is already running.
(...skipping 30 matching lines...) Expand all
217 SigninScreenHandler* signin_screen_handler_; 221 SigninScreenHandler* signin_screen_handler_;
218 222
219 base::WeakPtrFactory<GaiaScreenHandler> weak_factory_; 223 base::WeakPtrFactory<GaiaScreenHandler> weak_factory_;
220 224
221 DISALLOW_COPY_AND_ASSIGN(GaiaScreenHandler); 225 DISALLOW_COPY_AND_ASSIGN(GaiaScreenHandler);
222 }; 226 };
223 227
224 } // namespace chromeos 228 } // namespace chromeos
225 229
226 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_ 230 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698