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

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

Issue 2700303002: cros: Unify oobe View/Actor naming to just View. (Closed)
Patch Set: Rebase Created 3 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/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/callback.h" 9 #include "base/callback.h"
10 #include "base/guid.h" 10 #include "base/guid.h"
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 // GAIA ID of the current user. 219 // GAIA ID of the current user.
220 std::string gaia_id; 220 std::string gaia_id;
221 221
222 // GAPS cookie. 222 // GAPS cookie.
223 std::string gaps_cookie; 223 std::string gaps_cookie;
224 }; 224 };
225 225
226 GaiaScreenHandler::GaiaContext::GaiaContext() {} 226 GaiaScreenHandler::GaiaContext::GaiaContext() {}
227 227
228 GaiaScreenHandler::GaiaScreenHandler( 228 GaiaScreenHandler::GaiaScreenHandler(
229 CoreOobeActor* core_oobe_actor, 229 CoreOobeView* core_oobe_actor,
230 const scoped_refptr<NetworkStateInformer>& network_state_informer) 230 const scoped_refptr<NetworkStateInformer>& network_state_informer)
231 : network_state_informer_(network_state_informer), 231 : network_state_informer_(network_state_informer),
232 core_oobe_actor_(core_oobe_actor), 232 core_oobe_actor_(core_oobe_actor),
233 weak_factory_(this) { 233 weak_factory_(this) {
234 DCHECK(network_state_informer_.get()); 234 DCHECK(network_state_informer_.get());
235 set_call_js_prefix(kJsScreenPath); 235 set_call_js_prefix(kJsScreenPath);
236 } 236 }
237 237
238 GaiaScreenHandler::~GaiaScreenHandler() { 238 GaiaScreenHandler::~GaiaScreenHandler() {
239 if (network_portal_detector_) 239 if (network_portal_detector_)
(...skipping 732 matching lines...) Expand 10 before | Expand all | Expand 10 after
972 bool GaiaScreenHandler::IsRestrictiveProxy() const { 972 bool GaiaScreenHandler::IsRestrictiveProxy() const {
973 return !disable_restrictive_proxy_check_for_test_ && 973 return !disable_restrictive_proxy_check_for_test_ &&
974 !IsOnline(captive_portal_status_); 974 !IsOnline(captive_portal_status_);
975 } 975 }
976 976
977 void GaiaScreenHandler::DisableRestrictiveProxyCheckForTest() { 977 void GaiaScreenHandler::DisableRestrictiveProxyCheckForTest() {
978 disable_restrictive_proxy_check_for_test_ = true; 978 disable_restrictive_proxy_check_for_test_ = true;
979 } 979 }
980 980
981 } // namespace chromeos 981 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698