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

Side by Side Diff: components/storage_monitor/test_storage_monitor.h

Issue 1056633004: Update {virtual,override} to follow C++11 style in components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix logo tracker unittest. Created 5 years, 8 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 COMPONENTS_STORAGE_MONITOR_TEST_STORAGE_MONITOR_H_ 5 #ifndef COMPONENTS_STORAGE_MONITOR_TEST_STORAGE_MONITOR_H_
6 #define COMPONENTS_STORAGE_MONITOR_TEST_STORAGE_MONITOR_H_ 6 #define COMPONENTS_STORAGE_MONITOR_TEST_STORAGE_MONITOR_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "components/storage_monitor/storage_monitor.h" 10 #include "components/storage_monitor/storage_monitor.h"
(...skipping 20 matching lines...) Expand all
31 // convenience. Use |Destroy| to delete the singleton. 31 // convenience. Use |Destroy| to delete the singleton.
32 static TestStorageMonitor* CreateForBrowserTests(); 32 static TestStorageMonitor* CreateForBrowserTests();
33 33
34 // Synchronously initialize the current storage monitor. 34 // Synchronously initialize the current storage monitor.
35 static void SyncInitialize(); 35 static void SyncInitialize();
36 36
37 bool GetStorageInfoForPath(const base::FilePath& path, 37 bool GetStorageInfoForPath(const base::FilePath& path,
38 StorageInfo* device_info) const override; 38 StorageInfo* device_info) const override;
39 39
40 #if defined(OS_WIN) 40 #if defined(OS_WIN)
41 virtual bool GetMTPStorageInfoFromDeviceId( 41 bool GetMTPStorageInfoFromDeviceId(
42 const std::string& storage_device_id, 42 const std::string& storage_device_id,
43 base::string16* device_location, 43 base::string16* device_location,
44 base::string16* storage_object_id) const override; 44 base::string16* storage_object_id) const override;
45 #endif 45 #endif
46 46
47 #if defined(OS_LINUX) 47 #if defined(OS_LINUX)
48 device::MediaTransferProtocolManager* media_transfer_protocol_manager() 48 device::MediaTransferProtocolManager* media_transfer_protocol_manager()
49 override; 49 override;
50 #endif 50 #endif
51 51
(...skipping 16 matching lines...) Expand all
68 68
69 #if defined(OS_LINUX) 69 #if defined(OS_LINUX)
70 scoped_ptr<device::MediaTransferProtocolManager> 70 scoped_ptr<device::MediaTransferProtocolManager>
71 media_transfer_protocol_manager_; 71 media_transfer_protocol_manager_;
72 #endif 72 #endif
73 }; 73 };
74 74
75 } // namespace storage_monitor 75 } // namespace storage_monitor
76 76
77 #endif // COMPONENTS_STORAGE_MONITOR_TEST_STORAGE_MONITOR_H_ 77 #endif // COMPONENTS_STORAGE_MONITOR_TEST_STORAGE_MONITOR_H_
OLDNEW
« no previous file with comments | « components/storage_monitor/test_portable_device_watcher_win.h ('k') | components/storage_monitor/test_storage_monitor_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698