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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side 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, 4 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 | Annotate | Revision Log
« 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')
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 #ifndef ASH_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_ 5 #ifndef ASH_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_
6 #define ASH_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_ 6 #define ASH_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_
7 7
8 #include "ash/system/tray/system_tray_delegate.h" 8 #include "ash/system/tray/system_tray_delegate.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 virtual void ConnectToBluetoothDevice(const std::string& address) OVERRIDE; 62 virtual void ConnectToBluetoothDevice(const std::string& address) OVERRIDE;
63 virtual void GetCurrentIME(IMEInfo* info) OVERRIDE; 63 virtual void GetCurrentIME(IMEInfo* info) OVERRIDE;
64 virtual void GetAvailableIMEList(IMEInfoList* list) OVERRIDE; 64 virtual void GetAvailableIMEList(IMEInfoList* list) OVERRIDE;
65 virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) OVERRIDE; 65 virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) OVERRIDE;
66 virtual void SwitchIME(const std::string& ime_id) OVERRIDE; 66 virtual void SwitchIME(const std::string& ime_id) OVERRIDE;
67 virtual void ActivateIMEProperty(const std::string& key) OVERRIDE; 67 virtual void ActivateIMEProperty(const std::string& key) OVERRIDE;
68 virtual void CancelDriveOperation(int32 operation_id) OVERRIDE; 68 virtual void CancelDriveOperation(int32 operation_id) OVERRIDE;
69 virtual void GetDriveOperationStatusList( 69 virtual void GetDriveOperationStatusList(
70 ash::DriveOperationStatusList*) OVERRIDE; 70 ash::DriveOperationStatusList*) OVERRIDE;
71 virtual void ConfigureNetwork(const std::string& network_id) OVERRIDE; 71 virtual void ConfigureNetwork(const std::string& network_id) OVERRIDE;
72 virtual void ConnectToNetwork(const std::string& network_id) OVERRIDE; 72 virtual void EnrollOrConfigureNetwork(
73 const std::string& network_id,
74 gfx::NativeWindow parent_window) OVERRIDE;
73 virtual void ManageBluetoothDevices() OVERRIDE; 75 virtual void ManageBluetoothDevices() OVERRIDE;
74 virtual void ToggleBluetooth() OVERRIDE; 76 virtual void ToggleBluetooth() OVERRIDE;
75 virtual bool IsBluetoothDiscovering() OVERRIDE; 77 virtual bool IsBluetoothDiscovering() OVERRIDE;
76 virtual void ShowMobileSimDialog() OVERRIDE; 78 virtual void ShowMobileSimDialog() OVERRIDE;
79 virtual void ShowMobileSetup(const std::string& network_id) OVERRIDE;
77 virtual void ShowOtherWifi() OVERRIDE; 80 virtual void ShowOtherWifi() OVERRIDE;
78 virtual void ShowOtherVPN() OVERRIDE; 81 virtual void ShowOtherVPN() OVERRIDE;
79 virtual void ShowOtherCellular() OVERRIDE; 82 virtual void ShowOtherCellular() OVERRIDE;
80 virtual bool GetBluetoothAvailable() OVERRIDE; 83 virtual bool GetBluetoothAvailable() OVERRIDE;
81 virtual bool GetBluetoothEnabled() OVERRIDE; 84 virtual bool GetBluetoothEnabled() OVERRIDE;
82 virtual bool GetCellularCarrierInfo(std::string* carrier_id, 85 virtual bool GetCellularCarrierInfo(std::string* carrier_id,
83 std::string* topup_url, 86 std::string* topup_url,
84 std::string* setup_url) OVERRIDE; 87 std::string* setup_url) OVERRIDE;
85 virtual void ShowCellularURL(const std::string& url) OVERRIDE; 88 virtual void ShowCellularURL(const std::string& url) OVERRIDE;
86 virtual void ChangeProxySettings() OVERRIDE; 89 virtual void ChangeProxySettings() OVERRIDE;
(...skipping 19 matching lines...) Expand all
106 bool should_show_display_notification_; 109 bool should_show_display_notification_;
107 scoped_ptr<VolumeControlDelegate> volume_control_delegate_; 110 scoped_ptr<VolumeControlDelegate> volume_control_delegate_;
108 111
109 DISALLOW_COPY_AND_ASSIGN(TestSystemTrayDelegate); 112 DISALLOW_COPY_AND_ASSIGN(TestSystemTrayDelegate);
110 }; 113 };
111 114
112 } // namespace test 115 } // namespace test
113 } // namespace ash 116 } // namespace ash
114 117
115 #endif // ASH_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_ 118 #endif // ASH_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_
OLDNEW
« 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')

Powered by Google App Engine
This is Rietveld 408576698