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

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

Issue 2710673003: cros: Remove usage of GaiaScreenHandler outside of login/webui. (Closed)
Patch Set: Initial upload 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_view.h" 13 #include "chrome/browser/chromeos/login/screens/core_oobe_view.h"
14 #include "chrome/browser/chromeos/login/screens/gaia_view.h"
14 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h" 15 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
15 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h" 16 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
16 #include "chromeos/network/portal_detector/network_portal_detector.h" 17 #include "chromeos/network/portal_detector/network_portal_detector.h"
17 #include "net/base/net_errors.h" 18 #include "net/base/net_errors.h"
18 #include "third_party/cros_system_api/dbus/service_constants.h" 19 #include "third_party/cros_system_api/dbus/service_constants.h"
19 20
20 class AccountId; 21 class AccountId;
21 22
22 namespace authpolicy { 23 namespace authpolicy {
23 class ActiveDirectoryAccountData; 24 class ActiveDirectoryAccountData;
24 } 25 }
25 26
26 namespace chromeos { 27 namespace chromeos {
27 28
28 class Key; 29 class Key;
29 class SigninScreenHandler; 30 class SigninScreenHandler;
30 class SigninScreenHandlerDelegate; 31 class SigninScreenHandlerDelegate;
31 32
32 // A class that handles WebUI hooks in Gaia screen. 33 // A class that handles WebUI hooks in Gaia screen.
33 class GaiaScreenHandler : public BaseScreenHandler, 34 class GaiaScreenHandler : public BaseScreenHandler,
35 public GaiaView,
34 public NetworkPortalDetector::Observer { 36 public NetworkPortalDetector::Observer {
35 public: 37 public:
36 enum FrameState { 38 enum FrameState {
37 FRAME_STATE_UNKNOWN = 0, 39 FRAME_STATE_UNKNOWN = 0,
38 FRAME_STATE_LOADING, 40 FRAME_STATE_LOADING,
39 FRAME_STATE_LOADED, 41 FRAME_STATE_LOADED,
40 FRAME_STATE_ERROR 42 FRAME_STATE_ERROR
41 }; 43 };
42 44
43 GaiaScreenHandler( 45 GaiaScreenHandler(
44 CoreOobeView* core_oobe_actor, 46 CoreOobeView* core_oobe_actor,
45 const scoped_refptr<NetworkStateInformer>& network_state_informer); 47 const scoped_refptr<NetworkStateInformer>& network_state_informer);
46 ~GaiaScreenHandler() override; 48 ~GaiaScreenHandler() override;
47 49
48 // Decides whether an auth extension should be pre-loaded. If it should, 50 // GaiaView:
49 // pre-loads it. 51 void MaybePreloadAuthExtension() override;
50 void MaybePreloadAuthExtension(); 52 void DisableRestrictiveProxyCheckForTest() override;
51
52 void DisableRestrictiveProxyCheckForTest();
53 53
54 private: 54 private:
55 // TODO (antrim@): remove this dependency. 55 // TODO (antrim@): remove this dependency.
56 friend class SigninScreenHandler; 56 friend class SigninScreenHandler;
57 57
58 struct GaiaContext; 58 struct GaiaContext;
59 59
60 void LoadGaia(const GaiaContext& context); 60 void LoadGaia(const GaiaContext& context);
61 61
62 // Callback that loads GAIA after version information has been retrieved. 62 // Callback that loads GAIA after version information has been retrieved.
(...skipping 213 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