ash/system/tray/test_system_tray_delegate.h - 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/tray/test_system_tray_delegate.h

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

Index: ash/system/tray/test_system_tray_delegate.h

diff --git a/ash/system/tray/test_system_tray_delegate.h b/ash/system/tray/test_system_tray_delegate.h

index 26a3dc7a6161fa6ee353fb446ac8318d1e697f9c..3b4ede765bbe684c0cec885ea34decadcc050b9f 100644

--- a/ash/system/tray/test_system_tray_delegate.h

+++ b/ash/system/tray/test_system_tray_delegate.h

@@ -69,11 +69,14 @@ class TestSystemTrayDelegate : public SystemTrayDelegate {

virtual void GetDriveOperationStatusList(

ash::DriveOperationStatusList*) OVERRIDE;

virtual void ConfigureNetwork(const std::string& network_id) OVERRIDE;

- virtual void ConnectToNetwork(const std::string& network_id) OVERRIDE;

+ virtual void EnrollOrConfigureNetwork(

+ const std::string& network_id,

+ gfx::NativeWindow parent_window) OVERRIDE;

virtual void ManageBluetoothDevices() OVERRIDE;

virtual void ToggleBluetooth() OVERRIDE;

virtual bool IsBluetoothDiscovering() OVERRIDE;

virtual void ShowMobileSimDialog() OVERRIDE;

+ virtual void ShowMobileSetup(const std::string& network_id) OVERRIDE;

virtual void ShowOtherWifi() OVERRIDE;

virtual void ShowOtherVPN() OVERRIDE;

virtual void ShowOtherCellular() OVERRIDE;