chrome/browser/chromeos/status/network_menu.cc - Issue 14753003: Don't open mobile setup when activating Sprint network from network menu

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/status/network_menu.cc

Issue 14753003: Don't open mobile setup when activating Sprint network from network menu (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 7 years, 7 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/cros/network_library_impl_base.cc ('k') | chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/status/network_menu.cc

diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc

index 0ad5bc8ad999dee6bd8ddf5633b5426da12635db..f98c96700c29e86aebe001947de316cccbcee143 100644

--- a/chrome/browser/chromeos/status/network_menu.cc

+++ b/chrome/browser/chromeos/status/network_menu.cc

@@ -64,11 +64,17 @@ std::string EscapeAmpersands(const std::string& input) {

}

// Activate a cellular network.

-void ActivateCellular(const chromeos::CellularNetwork* cellular) {

+void ActivateCellular(chromeos::CellularNetwork* cellular) {

DCHECK(cellular);

- ash::Shell::GetInstance()->delegate()->OpenMobileSetup(

- cellular->service_path());

+ chromeos::NetworkLibrary* cros =

+ chromeos::CrosLibrary::Get()->GetNetworkLibrary();

+ if (cros->CellularDeviceUsesDirectActivation()) {

+ cellular->StartActivation();

+ } else {

+ ash::Shell::GetInstance()->delegate()->OpenMobileSetup(

+ cellular->service_path());

+ }

}

// Decides whether a network should be highlighted in the UI.