chrome/browser/media_transfer_protocol/media_transfer_protocol_daemon_client.cc - Issue 11722025: Revert 175073 because it fails to compile on Linux.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/media_transfer_protocol/media_transfer_protocol_daemon_client.cc

Issue 11722025: Revert 175073 because it fails to compile on Linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 7 years, 11 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 | « chrome/browser/media_transfer_protocol/media_transfer_protocol_daemon_client.h ('k') | chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.h » ('j') | device/device.gyp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Property Changes:

Added: svn:mergeinfo

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 #include "chrome/browser/media_transfer_protocol/media_transfer_protocol_daemon_ client.h"	5 #include "chrome/browser/media_transfer_protocol/media_transfer_protocol_daemon_ client.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/memory/weak_ptr.h"	8 #include "base/memory/weak_ptr.h"

9 #include "chrome/browser/media_transfer_protocol/mtp_file_entry.pb.h"	9 #include "chrome/browser/media_transfer_protocol/mtp_file_entry.pb.h"

10 #include "chrome/browser/media_transfer_protocol/mtp_storage_info.pb.h"	10 #include "chrome/browser/media_transfer_protocol/mtp_storage_info.pb.h"

(...skipping 469 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
480	480

481 // static	481 // static

482 MediaTransferProtocolDaemonClient*	482 MediaTransferProtocolDaemonClient*

483 MediaTransferProtocolDaemonClient::Create(dbus::Bus* bus, bool is_stub) {	483 MediaTransferProtocolDaemonClient::Create(dbus::Bus* bus, bool is_stub) {

484 if (is_stub)	484 if (is_stub)

485 return new MediaTransferProtocolDaemonClientStubImpl();	485 return new MediaTransferProtocolDaemonClientStubImpl();

486 return new MediaTransferProtocolDaemonClientImpl(bus);	486 return new MediaTransferProtocolDaemonClientImpl(bus);

487 }	487 }

488	488

489 } // namespace chrome	489 } // namespace chrome

OLD	NEW