ash/system/chromeos/network/network_state_list_detailed_view.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: ash/system/chromeos/network/network_state_list_detailed_view.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 | « ash/system/chromeos/network/network_connect.cc ('k') | ash/system/tray/system_tray_delegate.h » ('j') | chrome/browser/chromeos/options/network_config_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/system/chromeos/network/network_state_list_detailed_view.cc

diff --git a/ash/system/chromeos/network/network_state_list_detailed_view.cc b/ash/system/chromeos/network/network_state_list_detailed_view.cc

index abc888a5c39a7c526b4be4fd5f120f580e08f37a..64e6d3bc3ffd3ae4a2a2e310efd0efb3ded179ae 100644

--- a/ash/system/chromeos/network/network_state_list_detailed_view.cc

+++ b/ash/system/chromeos/network/network_state_list_detailed_view.cc

@@ -315,12 +315,8 @@ void NetworkStateListDetailedView::OnViewClicked(views::View* sender) {

if (!network || network->IsConnectedState() || network->IsConnectingState()) {

Shell::GetInstance()->system_tray_delegate()->ShowNetworkSettings(

service_path);

- } else if (CommandLine::ForCurrentProcess()->HasSwitch(

- chromeos::switches::kUseNewNetworkConnectionHandler)) {

- ash::network_connect::ConnectToNetwork(service_path);

} else {

- Shell::GetInstance()->system_tray_delegate()->ConnectToNetwork(

- service_path);

+ ash::network_connect::ConnectToNetwork(service_path, NULL);

}