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

Side by Side Diff: components/storage_monitor/storage_monitor_chromeos.cc

Issue 1126963003: [components/storage_monitor] Use ThreadTaskRunnerHandle instead of LoopProxy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
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 #include "components/storage_monitor/storage_monitor_chromeos.h" 5 #include "components/storage_monitor/storage_monitor_chromeos.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/single_thread_task_runner.h"
9 #include "base/stl_util.h" 10 #include "base/stl_util.h"
10 #include "base/strings/string16.h" 11 #include "base/strings/string16.h"
11 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
12 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
13 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
14 #include "components/storage_monitor/media_storage_util.h" 15 #include "components/storage_monitor/media_storage_util.h"
15 #include "components/storage_monitor/media_transfer_protocol_device_observer_lin ux.h" 16 #include "components/storage_monitor/media_transfer_protocol_device_observer_lin ux.h"
16 #include "components/storage_monitor/removable_device_constants.h" 17 #include "components/storage_monitor/removable_device_constants.h"
17 #include "content/public/browser/browser_thread.h" 18 #include "content/public/browser/browser_thread.h"
18 #include "device/media_transfer_protocol/media_transfer_protocol_manager.h" 19 #include "device/media_transfer_protocol/media_transfer_protocol_manager.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 manager->RemoveObserver(this); 98 manager->RemoveObserver(this);
98 } 99 }
99 } 100 }
100 101
101 void StorageMonitorCros::Init() { 102 void StorageMonitorCros::Init() {
102 DCHECK(DiskMountManager::GetInstance()); 103 DCHECK(DiskMountManager::GetInstance());
103 DiskMountManager::GetInstance()->AddObserver(this); 104 DiskMountManager::GetInstance()->AddObserver(this);
104 CheckExistingMountPoints(); 105 CheckExistingMountPoints();
105 106
106 if (!media_transfer_protocol_manager_) { 107 if (!media_transfer_protocol_manager_) {
107 scoped_refptr<base::MessageLoopProxy> loop_proxy; 108 scoped_refptr<base::SingleThreadTaskRunner> task_runner;
108 media_transfer_protocol_manager_.reset( 109 media_transfer_protocol_manager_.reset(
109 device::MediaTransferProtocolManager::Initialize(loop_proxy)); 110 device::MediaTransferProtocolManager::Initialize(task_runner));
erikwright (departed) 2015/05/11 18:29:18 shouldn't this just be ...Initialize(scoped_refpt
Pranay 2015/05/12 03:19:48 Done.
110 } 111 }
111 112
112 media_transfer_protocol_device_observer_.reset( 113 media_transfer_protocol_device_observer_.reset(
113 new MediaTransferProtocolDeviceObserverLinux( 114 new MediaTransferProtocolDeviceObserverLinux(
114 receiver(), media_transfer_protocol_manager_.get())); 115 receiver(), media_transfer_protocol_manager_.get()));
115 } 116 }
116 117
117 void StorageMonitorCros::CheckExistingMountPoints() { 118 void StorageMonitorCros::CheckExistingMountPoints() {
118 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 119 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
119 const DiskMountManager::MountPointMap& mount_point_map = 120 const DiskMountManager::MountPointMap& mount_point_map =
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 mount_map_.insert(std::make_pair(mount_info.mount_path, info)); 298 mount_map_.insert(std::make_pair(mount_info.mount_path, info));
298 299
299 receiver()->ProcessAttach(info); 300 receiver()->ProcessAttach(info);
300 } 301 }
301 302
302 StorageMonitor* StorageMonitor::CreateInternal() { 303 StorageMonitor* StorageMonitor::CreateInternal() {
303 return new StorageMonitorCros(); 304 return new StorageMonitorCros();
304 } 305 }
305 306
306 } // namespace storage_monitor 307 } // namespace storage_monitor
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698