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

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

Issue 795943002: Fix WeakPtrFactory member ordering in chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Adding more changes Created 6 years 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
« no previous file with comments | « chrome/browser/media_galleries/fileapi/iphoto_file_util.h ('k') | chrome/browser/ui/browser.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/iphoto_file_util.h" 5 #include "chrome/browser/media_galleries/fileapi/iphoto_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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 return result; 62 return result;
63 } 63 }
64 64
65 } // namespace 65 } // namespace
66 66
67 const char kIPhotoAlbumsDir[] = "Albums"; 67 const char kIPhotoAlbumsDir[] = "Albums";
68 const char kIPhotoOriginalsDir[] = "Originals"; 68 const char kIPhotoOriginalsDir[] = "Originals";
69 69
70 IPhotoFileUtil::IPhotoFileUtil(MediaPathFilter* media_path_filter) 70 IPhotoFileUtil::IPhotoFileUtil(MediaPathFilter* media_path_filter)
71 : NativeMediaFileUtil(media_path_filter), 71 : NativeMediaFileUtil(media_path_filter),
72 weak_factory_(this), 72 imported_registry_(NULL),
73 imported_registry_(NULL) { 73 weak_factory_(this) {
74 } 74 }
75 75
76 IPhotoFileUtil::~IPhotoFileUtil() { 76 IPhotoFileUtil::~IPhotoFileUtil() {
77 } 77 }
78 78
79 void IPhotoFileUtil::GetFileInfoOnTaskRunnerThread( 79 void IPhotoFileUtil::GetFileInfoOnTaskRunnerThread(
80 scoped_ptr<storage::FileSystemOperationContext> context, 80 scoped_ptr<storage::FileSystemOperationContext> context,
81 const storage::FileSystemURL& url, 81 const storage::FileSystemURL& url,
82 const GetFileInfoCallback& callback) { 82 const GetFileInfoCallback& callback) {
83 IPhotoDataProvider* data_provider = GetDataProvider(); 83 IPhotoDataProvider* data_provider = GetDataProvider();
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 return base::File::FILE_ERROR_NOT_FOUND; 349 return base::File::FILE_ERROR_NOT_FOUND;
350 } 350 }
351 351
352 IPhotoDataProvider* IPhotoFileUtil::GetDataProvider() { 352 IPhotoDataProvider* IPhotoFileUtil::GetDataProvider() {
353 if (!imported_registry_) 353 if (!imported_registry_)
354 imported_registry_ = ImportedMediaGalleryRegistry::GetInstance(); 354 imported_registry_ = ImportedMediaGalleryRegistry::GetInstance();
355 return imported_registry_->IPhotoDataProvider(); 355 return imported_registry_->IPhotoDataProvider();
356 } 356 }
357 357
358 } // namespace iphoto 358 } // namespace iphoto
OLDNEW
« no previous file with comments | « chrome/browser/media_galleries/fileapi/iphoto_file_util.h ('k') | chrome/browser/ui/browser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698