chrome/browser/media_galleries/imported_media_gallery_registry.cc - Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/

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_galleries/imported_media_gallery_registry.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

« no previous file with comments | « chrome/browser/media_galleries/gallery_watch_manager_unittest.cc ('k') | chrome/browser/media_galleries/linux/mtp_read_file_worker.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 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/imported_media_gallery_registry.h"	5 #include "chrome/browser/media_galleries/imported_media_gallery_registry.h"

6	6

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

8 #include "base/file_util.h"	8 #include "base/files/file_util.h"

9 #include "base/logging.h"	9 #include "base/logging.h"

10 #include "chrome/browser/media_galleries/fileapi/iphoto_data_provider.h"	10 #include "chrome/browser/media_galleries/fileapi/iphoto_data_provider.h"

11 #include "chrome/browser/media_galleries/fileapi/itunes_data_provider.h"	11 #include "chrome/browser/media_galleries/fileapi/itunes_data_provider.h"

12 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"	12 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"

13 #include "chrome/browser/media_galleries/fileapi/picasa_data_provider.h"	13 #include "chrome/browser/media_galleries/fileapi/picasa_data_provider.h"

14 #include "chrome/common/extensions/extension_constants.h"	14 #include "chrome/common/extensions/extension_constants.h"

15 #include "content/public/browser/browser_thread.h"	15 #include "content/public/browser/browser_thread.h"

16 #include "webkit/browser/fileapi/external_mount_points.h"	16 #include "webkit/browser/fileapi/external_mount_points.h"

17 #include "webkit/common/fileapi/file_system_mount_option.h"	17 #include "webkit/common/fileapi/file_system_mount_option.h"

18	18

(...skipping 260 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
279 DCHECK(!iphoto_data_provider_);	279 DCHECK(!iphoto_data_provider_);

280 iphoto_data_provider_.reset(new iphoto::IPhotoDataProvider(xml_library_path));	280 iphoto_data_provider_.reset(new iphoto::IPhotoDataProvider(xml_library_path));

281 }	281 }

282	282

283 void ImportedMediaGalleryRegistry::RevokeIPhotoFileSystem() {	283 void ImportedMediaGalleryRegistry::RevokeIPhotoFileSystem() {

284 DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());	284 DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());

285 DCHECK(iphoto_data_provider_);	285 DCHECK(iphoto_data_provider_);

286 iphoto_data_provider_.reset();	286 iphoto_data_provider_.reset();

287 }	287 }

288 #endif // defined(OS_MACOSX)	288 #endif // defined(OS_MACOSX)

OLD	NEW