| 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 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h" | 5 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h" | 
| 6 | 6 | 
| 7 #include "ash/common/system/chromeos/devicetype_utils.h" | 7 #include "ash/common/system/chromeos/devicetype_utils.h" | 
| 8 #include "base/bind.h" | 8 #include "base/bind.h" | 
| 9 #include "base/guid.h" | 9 #include "base/guid.h" | 
| 10 #include "base/logging.h" | 10 #include "base/logging.h" | 
| 11 #include "base/metrics/histogram.h" | 11 #include "base/metrics/histogram.h" | 
| 12 #include "base/stl_util.h" | 12 #include "base/stl_util.h" | 
| 13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" | 
| 14 #include "base/values.h" | 14 #include "base/values.h" | 
| 15 #include "chrome/browser/browser_process.h" | 15 #include "chrome/browser/browser_process.h" | 
| 16 #include "chrome/browser/browser_shutdown.h" | 16 #include "chrome/browser/browser_shutdown.h" | 
| 17 #include "chrome/browser/chromeos/input_method/input_method_util.h" | 17 #include "chrome/browser/chromeos/input_method/input_method_util.h" | 
| 18 #include "chrome/browser/chromeos/language_preferences.h" | 18 #include "chrome/browser/chromeos/language_preferences.h" | 
| 19 #include "chrome/browser/chromeos/login/screens/network_error.h" | 19 #include "chrome/browser/chromeos/login/screens/network_error.h" | 
| 20 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" | 20 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" | 
| 21 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" | 21 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" | 
| 22 #include "chrome/browser/chromeos/net/network_portal_detector_impl.h" | 22 #include "chrome/browser/chromeos/net/network_portal_detector_impl.h" | 
| 23 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 23 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 
| 24 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" | 24 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" | 
| 25 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 25 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 
| 26 #include "chrome/browser/chromeos/settings/cros_settings.h" | 26 #include "chrome/browser/chromeos/settings/cros_settings.h" | 
| 27 #include "chrome/browser/io_thread.h" | 27 #include "chrome/browser/io_thread.h" | 
| 28 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" | 28 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" | 
| 29 #include "chrome/browser/ui/webui/signin/get_auth_frame.h" | 29 #include "chrome/browser/ui/webui/signin/signin_utils.h" | 
| 30 #include "chrome/common/channel_info.h" | 30 #include "chrome/common/channel_info.h" | 
| 31 #include "chrome/common/pref_names.h" | 31 #include "chrome/common/pref_names.h" | 
| 32 #include "chrome/grit/generated_resources.h" | 32 #include "chrome/grit/generated_resources.h" | 
| 33 #include "chromeos/chromeos_switches.h" | 33 #include "chromeos/chromeos_switches.h" | 
| 34 #include "chromeos/login/auth/user_context.h" | 34 #include "chromeos/login/auth/user_context.h" | 
| 35 #include "chromeos/settings/cros_settings_names.h" | 35 #include "chromeos/settings/cros_settings_names.h" | 
| 36 #include "chromeos/system/devicetype.h" | 36 #include "chromeos/system/devicetype.h" | 
| 37 #include "chromeos/system/version_loader.h" | 37 #include "chromeos/system/version_loader.h" | 
| 38 #include "components/login/localized_values_builder.h" | 38 #include "components/login/localized_values_builder.h" | 
| 39 #include "components/prefs/pref_service.h" | 39 #include "components/prefs/pref_service.h" | 
| (...skipping 799 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 839 bool GaiaScreenHandler::IsRestrictiveProxy() const { | 839 bool GaiaScreenHandler::IsRestrictiveProxy() const { | 
| 840   return !disable_restrictive_proxy_check_for_test_ && | 840   return !disable_restrictive_proxy_check_for_test_ && | 
| 841          !IsOnline(captive_portal_status_); | 841          !IsOnline(captive_portal_status_); | 
| 842 } | 842 } | 
| 843 | 843 | 
| 844 void GaiaScreenHandler::DisableRestrictiveProxyCheckForTest() { | 844 void GaiaScreenHandler::DisableRestrictiveProxyCheckForTest() { | 
| 845   disable_restrictive_proxy_check_for_test_ = true; | 845   disable_restrictive_proxy_check_for_test_ = true; | 
| 846 } | 846 } | 
| 847 | 847 | 
| 848 }  // namespace chromeos | 848 }  // namespace chromeos | 
| OLD | NEW | 
|---|