chrome/browser/chromeos/mobile/mobile_activator.cc - Issue 21046008: Convert all connect code to use NetworkHandler instead of NetworkLibrary

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/mobile/mobile_activator.cc

Issue 21046008: Convert all connect code to use NetworkHandler instead of NetworkLibrary (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Restore check VPN PassphraseRequred Created 7 years, 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/login/chrome_restart_request.cc ('k') | chrome/browser/chromeos/network_login_observer.cc » ('j') | chrome/browser/chromeos/options/network_config_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/mobile/mobile_activator.cc

diff --git a/chrome/browser/chromeos/mobile/mobile_activator.cc b/chrome/browser/chromeos/mobile/mobile_activator.cc

index 2c42584047962d0ec4f8a2de8c2026fafcf8a7d9..a7acedeb409f1ed1656c2f9a92120c342b76794b 100644

--- a/chrome/browser/chromeos/mobile/mobile_activator.cc

+++ b/chrome/browser/chromeos/mobile/mobile_activator.cc

@@ -8,6 +8,7 @@

#include <map>

#include <string>

+#include "ash/system/chromeos/network/network_connect.h"

#include "base/bind.h"

#include "base/bind_helpers.h"

#include "base/file_util.h"

@@ -515,7 +516,7 @@ void MobileActivator::ContinueConnecting() {

LOG(WARNING) << "Connect failed, will try again in a little bit.";

if (network) {

LOG(INFO) << "Connecting to: " << network->service_path();

- GetNetworkLibrary()->ConnectToCellularNetwork(network);

+ ash::network_connect::ConnectToNetwork(network->service_path(), NULL);

}