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" |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
164 return; | 164 return; |
165 | 165 |
166 io_thread->ClearHostCache(); | 166 io_thread->ClearHostCache(); |
167 } | 167 } |
168 | 168 |
169 void PushFrontIMIfNotExists(const std::string& input_method, | 169 void PushFrontIMIfNotExists(const std::string& input_method, |
170 std::vector<std::string>* input_methods) { | 170 std::vector<std::string>* input_methods) { |
171 if (input_method.empty()) | 171 if (input_method.empty()) |
172 return; | 172 return; |
173 | 173 |
174 if (!ContainsValue(*input_methods, input_method)) | 174 if (!base::ContainsValue(*input_methods, input_method)) |
175 input_methods->insert(input_methods->begin(), input_method); | 175 input_methods->insert(input_methods->begin(), input_method); |
176 } | 176 } |
177 | 177 |
178 bool IsOnline(NetworkPortalDetector::CaptivePortalStatus status) { | 178 bool IsOnline(NetworkPortalDetector::CaptivePortalStatus status) { |
179 return status == NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE; | 179 return status == NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE; |
180 } | 180 } |
181 | 181 |
182 } // namespace | 182 } // namespace |
183 | 183 |
184 // A class that's used to specify the way how Gaia should be loaded. | 184 // A class that's used to specify the way how Gaia should be loaded. |
(...skipping 654 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 |