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

Side by Side Diff: chrome/browser/media_galleries/win/mtp_device_operations_util.cc

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge Created 6 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/win/mtp_device_operations_util.h" 5 #include "chrome/browser/media_galleries/win/mtp_device_operations_util.h"
6 6
7 #include <portabledevice.h> 7 #include <portabledevice.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/file_util.h"
13 #include "base/files/file_path.h" 12 #include "base/files/file_path.h"
13 #include "base/files/file_util.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/numerics/safe_conversions.h" 15 #include "base/numerics/safe_conversions.h"
16 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
17 #include "base/threading/thread_restrictions.h" 17 #include "base/threading/thread_restrictions.h"
18 #include "base/time/time.h" 18 #include "base/time/time.h"
19 #include "base/win/scoped_co_mem.h" 19 #include "base/win/scoped_co_mem.h"
20 #include "base/win/scoped_propvariant.h" 20 #include "base/win/scoped_propvariant.h"
21 #include "chrome/common/chrome_constants.h" 21 #include "chrome/common/chrome_constants.h"
22 22
23 namespace media_transfer_protocol { 23 namespace media_transfer_protocol {
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 object_entries.empty()) 406 object_entries.empty())
407 return base::string16(); 407 return base::string16();
408 // TODO(thestig): This DCHECK can fail. Multiple MTP objects can have 408 // TODO(thestig): This DCHECK can fail. Multiple MTP objects can have
409 // the same name. Handle the situation gracefully. Refer to crbug.com/169930 409 // the same name. Handle the situation gracefully. Refer to crbug.com/169930
410 // for more details. 410 // for more details.
411 DCHECK_EQ(1U, object_entries.size()); 411 DCHECK_EQ(1U, object_entries.size());
412 return object_entries[0].object_id; 412 return object_entries[0].object_id;
413 } 413 }
414 414
415 } // namespace media_transfer_protocol 415 } // namespace media_transfer_protocol
OLDNEW
« no previous file with comments | « chrome/browser/media_galleries/media_scan_manager_unittest.cc ('k') | chrome/browser/memory_details_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698