chrome/browser/storage_monitor/test_storage_monitor.h - Issue 14016002: Storage Monitor: Make StorageMonitorLinux own the MediaTransferProtocolManager.

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/storage_monitor/test_storage_monitor.h

Issue 14016002: Storage Monitor: Make StorageMonitorLinux own the MediaTransferProtocolManager. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: fix browser_tests Created 7 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/storage_monitor/test_media_transfer_protocol_manager_linux.cc ('k') | chrome/browser/storage_monitor/test_storage_monitor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/storage_monitor/test_storage_monitor.h

===================================================================

--- chrome/browser/storage_monitor/test_storage_monitor.h (revision 194743)

+++ chrome/browser/storage_monitor/test_storage_monitor.h (working copy)

@@ -5,6 +5,8 @@

#ifndef CHROME_BROWSER_STORAGE_MONITOR_TEST_STORAGE_MONITOR_H_

#define CHROME_BROWSER_STORAGE_MONITOR_TEST_STORAGE_MONITOR_H_

+#include <string>

#include "chrome/browser/storage_monitor/storage_monitor.h"

namespace chrome {

@@ -30,6 +32,11 @@

string16* storage_object_id) const OVERRIDE;

#endif

+#if defined(OS_LINUX)

+ virtual device::MediaTransferProtocolManager*

+ media_transfer_protocol_manager() OVERRIDE;

+#endif

virtual Receiver* receiver() const OVERRIDE;

virtual void EjectDevice(

@@ -41,6 +48,11 @@

private:

std::string ejected_device_;

+#if defined(OS_LINUX)

+ scoped_ptr<device::MediaTransferProtocolManager>

+ media_transfer_protocol_manager_;

+#endif

};

} // namespace test