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

Side by Side Diff: chrome/browser/chromeos/login/helper.cc

Issue 1779633002: Invoke createNetwork() callback with GUID, not service name (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix more trybot failures Created 4 years, 9 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
« no previous file with comments | « chrome/browser/chromeos/login/helper.h ('k') | chrome/browser/chromeos/net/onc_utils.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chromeos/login/helper.h" 5 #include "chrome/browser/chromeos/login/helper.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/json/json_reader.h" 9 #include "base/json/json_reader.h"
10 #include "base/json/json_writer.h" 10 #include "base/json/json_writer.h"
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 bool NetworkStateHelper::IsConnecting() const { 193 bool NetworkStateHelper::IsConnecting() const {
194 chromeos::NetworkStateHandler* nsh = 194 chromeos::NetworkStateHandler* nsh =
195 chromeos::NetworkHandler::Get()->network_state_handler(); 195 chromeos::NetworkHandler::Get()->network_state_handler();
196 return nsh->ConnectingNetworkByType( 196 return nsh->ConnectingNetworkByType(
197 chromeos::NetworkTypePattern::Default()) != nullptr; 197 chromeos::NetworkTypePattern::Default()) != nullptr;
198 } 198 }
199 199
200 void NetworkStateHelper::OnCreateConfiguration( 200 void NetworkStateHelper::OnCreateConfiguration(
201 const base::Closure& success_callback, 201 const base::Closure& success_callback,
202 const base::Closure& error_callback, 202 const base::Closure& error_callback,
203 const std::string& service_path) const { 203 const std::string& service_path,
204 const std::string& guid) const {
204 // Connect to the network. 205 // Connect to the network.
205 NetworkHandler::Get()->network_connection_handler()->ConnectToNetwork( 206 NetworkHandler::Get()->network_connection_handler()->ConnectToNetwork(
206 service_path, success_callback, 207 service_path, success_callback,
207 base::Bind(&NetworkStateHelper::OnCreateOrConnectNetworkFailed, 208 base::Bind(&NetworkStateHelper::OnCreateOrConnectNetworkFailed,
208 base::Unretained(this), error_callback), 209 base::Unretained(this), error_callback),
209 false); 210 false);
210 } 211 }
211 212
212 void NetworkStateHelper::OnCreateOrConnectNetworkFailed( 213 void NetworkStateHelper::OnCreateOrConnectNetworkFailed(
213 const base::Closure& error_callback, 214 const base::Closure& error_callback,
(...skipping 28 matching lines...) Expand all
242 243
243 return signin_partition->GetURLRequestContext(); 244 return signin_partition->GetURLRequestContext();
244 } 245 }
245 246
246 return ProfileHelper::GetSigninProfile()->GetRequestContext(); 247 return ProfileHelper::GetSigninProfile()->GetRequestContext();
247 } 248 }
248 249
249 } // namespace login 250 } // namespace login
250 251
251 } // namespace chromeos 252 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/helper.h ('k') | chrome/browser/chromeos/net/onc_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698