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

Side by Side Diff: chrome/browser/media_galleries/fileapi/itunes_file_util.cc

Issue 575993002: Fix WeakPtrFactory member ordering in chrome/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
OLDNEW
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/fileapi/itunes_file_util.h" 5 #include "chrome/browser/media_galleries/fileapi/itunes_file_util.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 51
52 } // namespace 52 } // namespace
53 53
54 const char kITunesLibraryXML[] = "iTunes Music Library.xml"; 54 const char kITunesLibraryXML[] = "iTunes Music Library.xml";
55 const char kITunesMediaDir[] = "iTunes Media"; 55 const char kITunesMediaDir[] = "iTunes Media";
56 const char kITunesMusicDir[] = "Music"; 56 const char kITunesMusicDir[] = "Music";
57 const char kITunesAutoAddDir[] = "Automatically Add to iTunes"; 57 const char kITunesAutoAddDir[] = "Automatically Add to iTunes";
58 58
59 ITunesFileUtil::ITunesFileUtil(MediaPathFilter* media_path_filter) 59 ITunesFileUtil::ITunesFileUtil(MediaPathFilter* media_path_filter)
60 : NativeMediaFileUtil(media_path_filter), 60 : NativeMediaFileUtil(media_path_filter),
61 weak_factory_(this), 61 imported_registry_(NULL),
62 imported_registry_(NULL) { 62 weak_factory_(this) {
63 } 63 }
64 64
65 ITunesFileUtil::~ITunesFileUtil() { 65 ITunesFileUtil::~ITunesFileUtil() {
66 } 66 }
67 67
68 void ITunesFileUtil::GetFileInfoOnTaskRunnerThread( 68 void ITunesFileUtil::GetFileInfoOnTaskRunnerThread(
69 scoped_ptr<storage::FileSystemOperationContext> context, 69 scoped_ptr<storage::FileSystemOperationContext> context,
70 const storage::FileSystemURL& url, 70 const storage::FileSystemURL& url,
71 const GetFileInfoCallback& callback) { 71 const GetFileInfoCallback& callback) {
72 ITunesDataProvider* data_provider = GetDataProvider(); 72 ITunesDataProvider* data_provider = GetDataProvider();
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 callback); 413 callback);
414 } 414 }
415 415
416 ITunesDataProvider* ITunesFileUtil::GetDataProvider() { 416 ITunesDataProvider* ITunesFileUtil::GetDataProvider() {
417 if (!imported_registry_) 417 if (!imported_registry_)
418 imported_registry_ = ImportedMediaGalleryRegistry::GetInstance(); 418 imported_registry_ = ImportedMediaGalleryRegistry::GetInstance();
419 return imported_registry_->ITunesDataProvider(); 419 return imported_registry_->ITunesDataProvider();
420 } 420 }
421 421
422 } // namespace itunes 422 } // namespace itunes
OLDNEW
« no previous file with comments | « chrome/browser/media_galleries/fileapi/itunes_file_util.h ('k') | chrome/browser/net/dns_probe_runner.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698