ash/system/tray/test_system_tray_delegate.h - Issue 12211108: Rename FilePath -> base::FilePath in various toplevel directories

Side by Side Diff: ash/system/tray/test_system_tray_delegate.h

Issue 12211108: Rename FilePath -> base::FilePath in various toplevel directories (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 10 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') | no next file with comments »

OLD	NEW
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 42 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
53 virtual void RequestRestart() OVERRIDE;	53 virtual void RequestRestart() OVERRIDE;

54 virtual void GetAvailableBluetoothDevices(BluetoothDeviceList* list) OVERRIDE;	54 virtual void GetAvailableBluetoothDevices(BluetoothDeviceList* list) OVERRIDE;

55 virtual void BluetoothStartDiscovering() OVERRIDE;	55 virtual void BluetoothStartDiscovering() OVERRIDE;

56 virtual void BluetoothStopDiscovering() OVERRIDE;	56 virtual void BluetoothStopDiscovering() OVERRIDE;

57 virtual void ToggleBluetoothConnection(const std::string& address) OVERRIDE;	57 virtual void ToggleBluetoothConnection(const std::string& address) OVERRIDE;

58 virtual void GetCurrentIME(IMEInfo* info) OVERRIDE;	58 virtual void GetCurrentIME(IMEInfo* info) OVERRIDE;

59 virtual void GetAvailableIMEList(IMEInfoList* list) OVERRIDE;	59 virtual void GetAvailableIMEList(IMEInfoList* list) OVERRIDE;

60 virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) OVERRIDE;	60 virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) OVERRIDE;

61 virtual void SwitchIME(const std::string& ime_id) OVERRIDE;	61 virtual void SwitchIME(const std::string& ime_id) OVERRIDE;

62 virtual void ActivateIMEProperty(const std::string& key) OVERRIDE;	62 virtual void ActivateIMEProperty(const std::string& key) OVERRIDE;

63 virtual void CancelDriveOperation(const FilePath&) OVERRIDE;	63 virtual void CancelDriveOperation(const base::FilePath&) OVERRIDE;

64 virtual void GetDriveOperationStatusList(	64 virtual void GetDriveOperationStatusList(

65 ash::DriveOperationStatusList*) OVERRIDE;	65 ash::DriveOperationStatusList*) OVERRIDE;

66 virtual void GetMostRelevantNetworkIcon(NetworkIconInfo* info,	66 virtual void GetMostRelevantNetworkIcon(NetworkIconInfo* info,

67 bool large) OVERRIDE;	67 bool large) OVERRIDE;

68 virtual void GetVirtualNetworkIcon(ash::NetworkIconInfo* info) OVERRIDE;	68 virtual void GetVirtualNetworkIcon(ash::NetworkIconInfo* info) OVERRIDE;

69 virtual void GetAvailableNetworks(	69 virtual void GetAvailableNetworks(

70 std::vector<NetworkIconInfo>* list) OVERRIDE;	70 std::vector<NetworkIconInfo>* list) OVERRIDE;

71 virtual void GetVirtualNetworks(std::vector<NetworkIconInfo>* list) OVERRIDE;	71 virtual void GetVirtualNetworks(std::vector<NetworkIconInfo>* list) OVERRIDE;

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

73 virtual void GetNetworkAddresses(std::string* ip_address,	73 virtual void GetNetworkAddresses(std::string* ip_address,

(...skipping 38 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
112 gfx::ImageSkia null_image_;	112 gfx::ImageSkia null_image_;

113 scoped_ptr<VolumeControlDelegate> volume_control_delegate_;	113 scoped_ptr<VolumeControlDelegate> volume_control_delegate_;

114	114

115 DISALLOW_COPY_AND_ASSIGN(TestSystemTrayDelegate);	115 DISALLOW_COPY_AND_ASSIGN(TestSystemTrayDelegate);

116 };	116 };

117	117

118 } // namespace test	118 } // namespace test

119 } // namespace ash	119 } // namespace ash

120	120

121 #endif // ASH_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_	121 #endif // ASH_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_

OLD	NEW