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

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

Issue 2276823003: Change many chrome/browser includes to use qualified paths. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 3 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/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"
(...skipping 19 matching lines...) Expand all
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"
40 #include "components/strings/grit/components_strings.h"
40 #include "components/user_manager/known_user.h" 41 #include "components/user_manager/known_user.h"
41 #include "components/user_manager/user_manager.h" 42 #include "components/user_manager/user_manager.h"
42 #include "components/version_info/version_info.h" 43 #include "components/version_info/version_info.h"
43 #include "content/public/browser/browser_thread.h" 44 #include "content/public/browser/browser_thread.h"
44 #include "content/public/browser/render_frame_host.h" 45 #include "content/public/browser/render_frame_host.h"
45 #include "google_apis/gaia/gaia_auth_util.h" 46 #include "google_apis/gaia/gaia_auth_util.h"
46 #include "google_apis/gaia/gaia_urls.h" 47 #include "google_apis/gaia/gaia_urls.h"
47 #include "grit/components_strings.h"
48 #include "ui/base/ime/chromeos/input_method_manager.h" 48 #include "ui/base/ime/chromeos/input_method_manager.h"
49 #include "ui/base/l10n/l10n_util.h" 49 #include "ui/base/l10n/l10n_util.h"
50 50
51 using content::BrowserThread; 51 using content::BrowserThread;
52 namespace em = enterprise_management; 52 namespace em = enterprise_management;
53 53
54 namespace chromeos { 54 namespace chromeos {
55 55
56 namespace { 56 namespace {
57 57
(...skipping 781 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698