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

Side by Side Diff: chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm

Issue 23727009: Cleanup: Remove chrome namespace for storage monitor and media galleries. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nit Created 7 years, 3 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
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 "chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.h" 5 #include "chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/mac/scoped_nsobject.h" 9 #include "base/mac/scoped_nsobject.h"
10 #include "base/threading/sequenced_worker_pool.h" 10 #include "base/threading/sequenced_worker_pool.h"
11 #include "chrome/browser/media_galleries/mtp_device_delegate_impl.h" 11 #include "chrome/browser/media_galleries/mtp_device_delegate_impl.h"
12 #include "chrome/browser/storage_monitor/image_capture_device.h" 12 #include "chrome/browser/storage_monitor/image_capture_device.h"
13 #include "chrome/browser/storage_monitor/image_capture_device_manager.h" 13 #include "chrome/browser/storage_monitor/image_capture_device_manager.h"
14 #include "content/public/browser/browser_thread.h" 14 #include "content/public/browser/browser_thread.h"
15 #include "webkit/browser/fileapi/async_file_util.h" 15 #include "webkit/browser/fileapi/async_file_util.h"
16 16
17 namespace chrome {
18
19 namespace { 17 namespace {
20 18
21 int kReadDirectoryTimeLimitSeconds = 20; 19 int kReadDirectoryTimeLimitSeconds = 20;
22 20
23 typedef MTPDeviceAsyncDelegate::CreateSnapshotFileSuccessCallback 21 typedef MTPDeviceAsyncDelegate::CreateSnapshotFileSuccessCallback
24 CreateSnapshotFileSuccessCallback; 22 CreateSnapshotFileSuccessCallback;
25 typedef MTPDeviceAsyncDelegate::ErrorCallback ErrorCallback; 23 typedef MTPDeviceAsyncDelegate::ErrorCallback ErrorCallback;
26 typedef MTPDeviceAsyncDelegate::GetFileInfoSuccessCallback 24 typedef MTPDeviceAsyncDelegate::GetFileInfoSuccessCallback
27 GetFileInfoSuccessCallback; 25 GetFileInfoSuccessCallback;
28 typedef MTPDeviceAsyncDelegate::ReadDirectorySuccessCallback 26 typedef MTPDeviceAsyncDelegate::ReadDirectorySuccessCallback
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 const CreateMTPDeviceAsyncDelegateCallback& cb) { 469 const CreateMTPDeviceAsyncDelegateCallback& cb) {
472 std::string device_name = base::FilePath(device_location).BaseName().value(); 470 std::string device_name = base::FilePath(device_location).BaseName().value();
473 std::string device_id; 471 std::string device_id;
474 StorageInfo::Type type; 472 StorageInfo::Type type;
475 bool cracked = StorageInfo::CrackDeviceId(device_name, &type, &device_id); 473 bool cracked = StorageInfo::CrackDeviceId(device_name, &type, &device_id);
476 DCHECK(cracked); 474 DCHECK(cracked);
477 DCHECK_EQ(StorageInfo::MAC_IMAGE_CAPTURE, type); 475 DCHECK_EQ(StorageInfo::MAC_IMAGE_CAPTURE, type);
478 476
479 cb.Run(new MTPDeviceDelegateImplMac(device_id, device_location)); 477 cb.Run(new MTPDeviceDelegateImplMac(device_id, device_location));
480 } 478 }
481
482 } // namespace chrome
483
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698