Chromium Code Reviews| OLD | NEW |
|---|---|
| 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" |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 72 GaiaScreenHandler( | 72 GaiaScreenHandler( |
| 73 CoreOobeActor* core_oobe_actor, | 73 CoreOobeActor* core_oobe_actor, |
| 74 const scoped_refptr<NetworkStateInformer>& network_state_informer, | 74 const scoped_refptr<NetworkStateInformer>& network_state_informer, |
| 75 policy::ConsumerManagementService* consumer_management); | 75 policy::ConsumerManagementService* consumer_management); |
| 76 ~GaiaScreenHandler() override; | 76 ~GaiaScreenHandler() override; |
| 77 | 77 |
| 78 // Decides whether an auth extension should be pre-loaded. If it should, | 78 // Decides whether an auth extension should be pre-loaded. If it should, |
| 79 // pre-loads it. | 79 // pre-loads it. |
| 80 void MaybePreloadAuthExtension(); | 80 void MaybePreloadAuthExtension(); |
| 81 | 81 |
| 82 void DisableRestrictiveProxyCheck(); | |
|
jdufault
2015/10/08 23:32:24
DisableRestrictiveProxyCheckForTest?
achuithb
2015/10/09 01:13:00
Done.
| |
| 83 | |
| 82 private: | 84 private: |
| 83 // TODO (antrim@): remove this dependency. | 85 // TODO (antrim@): remove this dependency. |
| 84 friend class SigninScreenHandler; | 86 friend class SigninScreenHandler; |
| 85 | 87 |
| 86 void LoadGaia(const GaiaContext& context); | 88 void LoadGaia(const GaiaContext& context); |
| 87 | 89 |
| 88 // Callback that loads GAIA after version information has been retrieved. | 90 // Callback that loads GAIA after version information has been retrieved. |
| 89 void LoadGaiaWithVersion(const GaiaContext& context, | 91 void LoadGaiaWithVersion(const GaiaContext& context, |
| 90 const std::string& platform_version); | 92 const std::string& platform_version); |
| 91 | 93 |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 271 bool test_expects_complete_login_ = false; | 273 bool test_expects_complete_login_ = false; |
| 272 | 274 |
| 273 // True if Easy bootstrap is enabled. | 275 // True if Easy bootstrap is enabled. |
| 274 bool use_easy_bootstrap_ = false; | 276 bool use_easy_bootstrap_ = false; |
| 275 | 277 |
| 276 // True if proxy doesn't allow access to google.com/generate_204. | 278 // True if proxy doesn't allow access to google.com/generate_204. |
| 277 NetworkPortalDetector::CaptivePortalStatus captive_portal_status_ = | 279 NetworkPortalDetector::CaptivePortalStatus captive_portal_status_ = |
| 278 NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN; | 280 NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN; |
| 279 | 281 |
| 280 scoped_ptr<NetworkPortalDetector> network_portal_detector_; | 282 scoped_ptr<NetworkPortalDetector> network_portal_detector_; |
| 283 bool disable_restrictive_proxy_check_ = false; | |
| 281 | 284 |
| 282 // Non-owning ptr to SigninScreenHandler instance. Should not be used | 285 // Non-owning ptr to SigninScreenHandler instance. Should not be used |
| 283 // in dtor. | 286 // in dtor. |
| 284 // TODO (antrim@): GaiaScreenHandler shouldn't communicate with | 287 // TODO (antrim@): GaiaScreenHandler shouldn't communicate with |
| 285 // signin_screen_handler directly. | 288 // signin_screen_handler directly. |
| 286 SigninScreenHandler* signin_screen_handler_ = nullptr; | 289 SigninScreenHandler* signin_screen_handler_ = nullptr; |
| 287 | 290 |
| 288 // GAIA extension loader. | 291 // GAIA extension loader. |
| 289 scoped_ptr<ScopedGaiaAuthExtension> auth_extension_; | 292 scoped_ptr<ScopedGaiaAuthExtension> auth_extension_; |
| 290 | 293 |
| 291 base::WeakPtrFactory<GaiaScreenHandler> weak_factory_; | 294 base::WeakPtrFactory<GaiaScreenHandler> weak_factory_; |
| 292 | 295 |
| 293 DISALLOW_COPY_AND_ASSIGN(GaiaScreenHandler); | 296 DISALLOW_COPY_AND_ASSIGN(GaiaScreenHandler); |
| 294 }; | 297 }; |
| 295 | 298 |
| 296 } // namespace chromeos | 299 } // namespace chromeos |
| 297 | 300 |
| 298 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_ | 301 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_ |
| OLD | NEW |