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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 #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/system/chromeos/devicetype_utils.h" 7 #include "ash/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/prefs/pref_service.h"
13 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
14 #include "base/values.h" 13 #include "base/values.h"
15 #include "chrome/browser/browser_process.h" 14 #include "chrome/browser/browser_process.h"
16 #include "chrome/browser/browser_shutdown.h" 15 #include "chrome/browser/browser_shutdown.h"
17 #include "chrome/browser/chromeos/input_method/input_method_util.h" 16 #include "chrome/browser/chromeos/input_method/input_method_util.h"
18 #include "chrome/browser/chromeos/language_preferences.h" 17 #include "chrome/browser/chromeos/language_preferences.h"
19 #include "chrome/browser/chromeos/login/screens/network_error.h" 18 #include "chrome/browser/chromeos/login/screens/network_error.h"
20 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" 19 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
21 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" 20 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
22 #include "chrome/browser/chromeos/net/network_portal_detector_impl.h" 21 #include "chrome/browser/chromeos/net/network_portal_detector_impl.h"
23 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 22 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
24 #include "chrome/browser/chromeos/profiles/profile_helper.h" 23 #include "chrome/browser/chromeos/profiles/profile_helper.h"
25 #include "chrome/browser/chromeos/settings/cros_settings.h" 24 #include "chrome/browser/chromeos/settings/cros_settings.h"
26 #include "chrome/browser/io_thread.h" 25 #include "chrome/browser/io_thread.h"
27 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 26 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
28 #include "chrome/browser/ui/webui/signin/get_auth_frame.h" 27 #include "chrome/browser/ui/webui/signin/get_auth_frame.h"
29 #include "chrome/common/channel_info.h" 28 #include "chrome/common/channel_info.h"
30 #include "chrome/common/pref_names.h" 29 #include "chrome/common/pref_names.h"
31 #include "chrome/grit/generated_resources.h" 30 #include "chrome/grit/generated_resources.h"
32 #include "chromeos/chromeos_switches.h" 31 #include "chromeos/chromeos_switches.h"
33 #include "chromeos/login/auth/user_context.h" 32 #include "chromeos/login/auth/user_context.h"
34 #include "chromeos/settings/cros_settings_names.h" 33 #include "chromeos/settings/cros_settings_names.h"
35 #include "chromeos/system/devicetype.h" 34 #include "chromeos/system/devicetype.h"
36 #include "chromeos/system/version_loader.h" 35 #include "chromeos/system/version_loader.h"
37 #include "components/login/localized_values_builder.h" 36 #include "components/login/localized_values_builder.h"
37 #include "components/prefs/pref_service.h"
38 #include "components/user_manager/known_user.h" 38 #include "components/user_manager/known_user.h"
39 #include "components/user_manager/user_manager.h" 39 #include "components/user_manager/user_manager.h"
40 #include "components/version_info/version_info.h" 40 #include "components/version_info/version_info.h"
41 #include "content/public/browser/browser_thread.h" 41 #include "content/public/browser/browser_thread.h"
42 #include "content/public/browser/render_frame_host.h" 42 #include "content/public/browser/render_frame_host.h"
43 #include "google_apis/gaia/gaia_auth_util.h" 43 #include "google_apis/gaia/gaia_auth_util.h"
44 #include "google_apis/gaia/gaia_urls.h" 44 #include "google_apis/gaia/gaia_urls.h"
45 #include "grit/components_strings.h" 45 #include "grit/components_strings.h"
46 #include "ui/base/ime/chromeos/input_method_manager.h" 46 #include "ui/base/ime/chromeos/input_method_manager.h"
47 #include "ui/base/l10n/l10n_util.h" 47 #include "ui/base/l10n/l10n_util.h"
(...skipping 744 matching lines...) Expand 10 before | Expand all | Expand 10 after
792 bool GaiaScreenHandler::IsRestrictiveProxy() const { 792 bool GaiaScreenHandler::IsRestrictiveProxy() const {
793 return !disable_restrictive_proxy_check_for_test_ && 793 return !disable_restrictive_proxy_check_for_test_ &&
794 !IsOnline(captive_portal_status_); 794 !IsOnline(captive_portal_status_);
795 } 795 }
796 796
797 void GaiaScreenHandler::DisableRestrictiveProxyCheckForTest() { 797 void GaiaScreenHandler::DisableRestrictiveProxyCheckForTest() {
798 disable_restrictive_proxy_check_for_test_ = true; 798 disable_restrictive_proxy_check_for_test_ = true;
799 } 799 }
800 800
801 } // namespace chromeos 801 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698