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

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

Issue 2700303002: cros: Unify oobe View/Actor naming to just View. (Closed)
Patch Set: Rebase Created 3 years, 10 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
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/command_line.h" 10 #include "base/command_line.h"
11 #include "base/macros.h" 11 #include "base/macros.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/chromeos/login/screens/core_oobe_view.h"
14 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" 14 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
15 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h" 15 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
16 #include "chromeos/network/portal_detector/network_portal_detector.h" 16 #include "chromeos/network/portal_detector/network_portal_detector.h"
17 #include "net/base/net_errors.h" 17 #include "net/base/net_errors.h"
18 #include "third_party/cros_system_api/dbus/service_constants.h" 18 #include "third_party/cros_system_api/dbus/service_constants.h"
19 19
20 class AccountId; 20 class AccountId;
21 21
22 namespace authpolicy { 22 namespace authpolicy {
23 class ActiveDirectoryAccountData; 23 class ActiveDirectoryAccountData;
(...skipping 10 matching lines...) Expand all
34 public NetworkPortalDetector::Observer { 34 public NetworkPortalDetector::Observer {
35 public: 35 public:
36 enum FrameState { 36 enum FrameState {
37 FRAME_STATE_UNKNOWN = 0, 37 FRAME_STATE_UNKNOWN = 0,
38 FRAME_STATE_LOADING, 38 FRAME_STATE_LOADING,
39 FRAME_STATE_LOADED, 39 FRAME_STATE_LOADED,
40 FRAME_STATE_ERROR 40 FRAME_STATE_ERROR
41 }; 41 };
42 42
43 GaiaScreenHandler( 43 GaiaScreenHandler(
44 CoreOobeActor* core_oobe_actor, 44 CoreOobeView* core_oobe_view,
45 const scoped_refptr<NetworkStateInformer>& network_state_informer); 45 const scoped_refptr<NetworkStateInformer>& network_state_informer);
46 ~GaiaScreenHandler() override; 46 ~GaiaScreenHandler() override;
47 47
48 // Decides whether an auth extension should be pre-loaded. If it should, 48 // Decides whether an auth extension should be pre-loaded. If it should,
49 // pre-loads it. 49 // pre-loads it.
50 void MaybePreloadAuthExtension(); 50 void MaybePreloadAuthExtension();
51 51
52 void DisableRestrictiveProxyCheckForTest(); 52 void DisableRestrictiveProxyCheckForTest();
53 53
54 private: 54 private:
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 213
214 // Current state of Gaia frame. 214 // Current state of Gaia frame.
215 FrameState frame_state_ = FRAME_STATE_UNKNOWN; 215 FrameState frame_state_ = FRAME_STATE_UNKNOWN;
216 216
217 // Latest Gaia frame error. 217 // Latest Gaia frame error.
218 net::Error frame_error_ = net::OK; 218 net::Error frame_error_ = net::OK;
219 219
220 // Network state informer used to keep signin screen up. 220 // Network state informer used to keep signin screen up.
221 scoped_refptr<NetworkStateInformer> network_state_informer_; 221 scoped_refptr<NetworkStateInformer> network_state_informer_;
222 222
223 CoreOobeActor* core_oobe_actor_ = nullptr; 223 CoreOobeView* core_oobe_view_ = nullptr;
224 224
225 // Email to pre-populate with. 225 // Email to pre-populate with.
226 std::string populated_email_; 226 std::string populated_email_;
227 227
228 // True if dns cache cleanup is done. 228 // True if dns cache cleanup is done.
229 bool dns_cleared_ = false; 229 bool dns_cleared_ = false;
230 230
231 // True if DNS cache task is already running. 231 // True if DNS cache task is already running.
232 bool dns_clear_task_running_ = false; 232 bool dns_clear_task_running_ = false;
233 233
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 bool auth_extension_being_loaded_ = false; 276 bool auth_extension_being_loaded_ = false;
277 277
278 base::WeakPtrFactory<GaiaScreenHandler> weak_factory_; 278 base::WeakPtrFactory<GaiaScreenHandler> weak_factory_;
279 279
280 DISALLOW_COPY_AND_ASSIGN(GaiaScreenHandler); 280 DISALLOW_COPY_AND_ASSIGN(GaiaScreenHandler);
281 }; 281 };
282 282
283 } // namespace chromeos 283 } // namespace chromeos
284 284
285 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_ 285 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698