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

Side by Side Diff: trunk/src/device/media_transfer_protocol/media_transfer_protocol_manager.cc

Issue 14985007: Revert 198844 "Move sequenced_task_runner to base/task" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 7 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
Property Changes:
Deleted: svn:mergeinfo
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 #include "device/media_transfer_protocol/media_transfer_protocol_manager.h" 5 #include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
6 6
7 #include <map> 7 #include <map>
8 #include <queue> 8 #include <queue>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
11 11
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/location.h" 14 #include "base/location.h"
15 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
16 #include "base/observer_list.h" 16 #include "base/observer_list.h"
17 #include "base/sequenced_task_runner.h"
17 #include "base/stl_util.h" 18 #include "base/stl_util.h"
18 #include "base/task/sequenced_task_runner.h"
19 #include "base/threading/thread_checker.h" 19 #include "base/threading/thread_checker.h"
20 #include "dbus/bus.h" 20 #include "dbus/bus.h"
21 #include "device/media_transfer_protocol/media_transfer_protocol_daemon_client.h " 21 #include "device/media_transfer_protocol/media_transfer_protocol_daemon_client.h "
22 #include "device/media_transfer_protocol/mtp_file_entry.pb.h" 22 #include "device/media_transfer_protocol/mtp_file_entry.pb.h"
23 #include "device/media_transfer_protocol/mtp_storage_info.pb.h" 23 #include "device/media_transfer_protocol/mtp_storage_info.pb.h"
24 #include "third_party/cros_system_api/dbus/service_constants.h" 24 #include "third_party/cros_system_api/dbus/service_constants.h"
25 25
26 #if defined(OS_CHROMEOS) 26 #if defined(OS_CHROMEOS)
27 #include "chromeos/dbus/dbus_thread_manager.h" 27 #include "chromeos/dbus/dbus_thread_manager.h"
28 #endif 28 #endif
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 DCHECK(!g_media_transfer_protocol_manager); 465 DCHECK(!g_media_transfer_protocol_manager);
466 466
467 g_media_transfer_protocol_manager = 467 g_media_transfer_protocol_manager =
468 new MediaTransferProtocolManagerImpl(task_runner); 468 new MediaTransferProtocolManagerImpl(task_runner);
469 VLOG(1) << "MediaTransferProtocolManager initialized"; 469 VLOG(1) << "MediaTransferProtocolManager initialized";
470 470
471 return g_media_transfer_protocol_manager; 471 return g_media_transfer_protocol_manager;
472 } 472 }
473 473
474 } // namespace device 474 } // namespace device
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698