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

Side by Side Diff: chrome/browser/chromeos/drive/file_system.cc

Issue 16998003: Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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/chromeos/drive/file_system.h" 5 #include "chrome/browser/chromeos/drive/file_system.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/message_loop/message_loop_proxy.h" 9 #include "base/message_loop/message_loop_proxy.h"
10 #include "base/platform_file.h" 10 #include "base/platform_file.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 &FileSystem::ReloadAfterReset, 94 &FileSystem::ReloadAfterReset,
95 weak_ptr_factory_.GetWeakPtr())); 95 weak_ptr_factory_.GetWeakPtr()));
96 } 96 }
97 97
98 void FileSystem::Initialize() { 98 void FileSystem::Initialize() {
99 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 99 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
100 100
101 SetupChangeListLoader(); 101 SetupChangeListLoader();
102 102
103 file_system::OperationObserver* observer = this; 103 file_system::OperationObserver* observer = this;
104 copy_operation_.reset(new file_system::CopyOperation( 104 copy_operation_.reset(
105 blocking_task_runner_, observer, scheduler_, resource_metadata_, cache_, 105 new file_system::CopyOperation(blocking_task_runner_.get(),
106 drive_service_)); 106 observer,
107 scheduler_,
108 resource_metadata_,
109 cache_,
110 drive_service_));
107 create_directory_operation_.reset(new file_system::CreateDirectoryOperation( 111 create_directory_operation_.reset(new file_system::CreateDirectoryOperation(
108 blocking_task_runner_, observer, scheduler_, resource_metadata_)); 112 blocking_task_runner_.get(), observer, scheduler_, resource_metadata_));
109 create_file_operation_.reset(new file_system::CreateFileOperation( 113 create_file_operation_.reset(
110 blocking_task_runner_, observer, scheduler_, resource_metadata_, cache_)); 114 new file_system::CreateFileOperation(blocking_task_runner_.get(),
111 move_operation_.reset(new file_system::MoveOperation( 115 observer,
112 observer, scheduler_, resource_metadata_)); 116 scheduler_,
113 remove_operation_.reset(new file_system::RemoveOperation( 117 resource_metadata_,
114 blocking_task_runner_, observer, scheduler_, resource_metadata_, cache_)); 118 cache_));
119 move_operation_.reset(
120 new file_system::MoveOperation(observer, scheduler_, resource_metadata_));
121 remove_operation_.reset(
122 new file_system::RemoveOperation(blocking_task_runner_.get(),
123 observer,
124 scheduler_,
125 resource_metadata_,
126 cache_));
115 touch_operation_.reset(new file_system::TouchOperation( 127 touch_operation_.reset(new file_system::TouchOperation(
116 blocking_task_runner_, observer, scheduler_, resource_metadata_)); 128 blocking_task_runner_.get(), observer, scheduler_, resource_metadata_));
117 download_operation_.reset(new file_system::DownloadOperation( 129 download_operation_.reset(
118 blocking_task_runner_, observer, scheduler_, resource_metadata_, cache_)); 130 new file_system::DownloadOperation(blocking_task_runner_.get(),
119 update_operation_.reset(new file_system::UpdateOperation( 131 observer,
120 blocking_task_runner_, observer, scheduler_, resource_metadata_, cache_)); 132 scheduler_,
133 resource_metadata_,
134 cache_));
135 update_operation_.reset(
136 new file_system::UpdateOperation(blocking_task_runner_.get(),
137 observer,
138 scheduler_,
139 resource_metadata_,
140 cache_));
121 search_operation_.reset(new file_system::SearchOperation( 141 search_operation_.reset(new file_system::SearchOperation(
122 blocking_task_runner_, scheduler_, resource_metadata_)); 142 blocking_task_runner_.get(), scheduler_, resource_metadata_));
123 sync_client_.reset(new internal::SyncClient( 143 sync_client_.reset(new internal::SyncClient(blocking_task_runner_.get(),
124 blocking_task_runner_, observer, scheduler_, resource_metadata_, cache_)); 144 observer,
145 scheduler_,
146 resource_metadata_,
147 cache_));
125 148
126 PrefService* pref_service = profile_->GetPrefs(); 149 PrefService* pref_service = profile_->GetPrefs();
127 hide_hosted_docs_ = pref_service->GetBoolean(prefs::kDisableDriveHostedFiles); 150 hide_hosted_docs_ = pref_service->GetBoolean(prefs::kDisableDriveHostedFiles);
128 151
129 InitializePreferenceObserver(); 152 InitializePreferenceObserver();
130 } 153 }
131 154
132 void FileSystem::ReloadAfterReset(FileError error) { 155 void FileSystem::ReloadAfterReset(FileError error) {
133 if (error != FILE_ERROR_OK) { 156 if (error != FILE_ERROR_OK) {
134 LOG(ERROR) << "Failed to reset the resource metadata: " 157 LOG(ERROR) << "Failed to reset the resource metadata: "
135 << FileErrorToString(error); 158 << FileErrorToString(error);
136 return; 159 return;
137 } 160 }
138 161
139 SetupChangeListLoader(); 162 SetupChangeListLoader();
140 163
141 change_list_loader_->LoadIfNeeded( 164 change_list_loader_->LoadIfNeeded(
142 DirectoryFetchInfo(), 165 DirectoryFetchInfo(),
143 base::Bind(&FileSystem::OnUpdateChecked, 166 base::Bind(&FileSystem::OnUpdateChecked,
144 weak_ptr_factory_.GetWeakPtr())); 167 weak_ptr_factory_.GetWeakPtr()));
145 } 168 }
146 169
147 void FileSystem::SetupChangeListLoader() { 170 void FileSystem::SetupChangeListLoader() {
148 change_list_loader_.reset(new internal::ChangeListLoader( 171 change_list_loader_.reset(new internal::ChangeListLoader(
149 blocking_task_runner_, resource_metadata_, scheduler_)); 172 blocking_task_runner_.get(), resource_metadata_, scheduler_));
150 change_list_loader_->AddObserver(this); 173 change_list_loader_->AddObserver(this);
151 } 174 }
152 175
153 void FileSystem::CheckForUpdates() { 176 void FileSystem::CheckForUpdates() {
154 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 177 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
155 DVLOG(1) << "CheckForUpdates"; 178 DVLOG(1) << "CheckForUpdates";
156 179
157 if (change_list_loader_) { 180 if (change_list_loader_) {
158 change_list_loader_->CheckForUpdates( 181 change_list_loader_->CheckForUpdates(
159 base::Bind(&FileSystem::OnUpdateChecked, 182 base::Bind(&FileSystem::OnUpdateChecked,
(...skipping 927 matching lines...) Expand 10 before | Expand all | Expand 10 after
1087 1110
1088 // When no dirty cache is found, use the original resource entry as is. 1111 // When no dirty cache is found, use the original resource entry as is.
1089 if (error != FILE_ERROR_OK) { 1112 if (error != FILE_ERROR_OK) {
1090 callback.Run(FILE_ERROR_OK, entry.Pass()); 1113 callback.Run(FILE_ERROR_OK, entry.Pass());
1091 return; 1114 return;
1092 } 1115 }
1093 1116
1094 // If the cache is dirty, obtain the file info from the cache file itself. 1117 // If the cache is dirty, obtain the file info from the cache file itself.
1095 base::PlatformFileInfo* file_info = new base::PlatformFileInfo; 1118 base::PlatformFileInfo* file_info = new base::PlatformFileInfo;
1096 base::PostTaskAndReplyWithResult( 1119 base::PostTaskAndReplyWithResult(
1097 blocking_task_runner_, 1120 blocking_task_runner_.get(),
1098 FROM_HERE, 1121 FROM_HERE,
1099 base::Bind(&file_util::GetFileInfo, 1122 base::Bind(&file_util::GetFileInfo,
1100 local_cache_path, 1123 local_cache_path,
1101 base::Unretained(file_info)), 1124 base::Unretained(file_info)),
1102 base::Bind(&FileSystem::CheckLocalModificationAndRunAfterGetFileInfo, 1125 base::Bind(&FileSystem::CheckLocalModificationAndRunAfterGetFileInfo,
1103 weak_ptr_factory_.GetWeakPtr(), 1126 weak_ptr_factory_.GetWeakPtr(),
1104 base::Passed(&entry), 1127 base::Passed(&entry),
1105 callback, 1128 callback,
1106 base::Owned(file_info))); 1129 base::Owned(file_info)));
1107 } 1130 }
(...skipping 11 matching lines...) Expand all
1119 return; 1142 return;
1120 } 1143 }
1121 1144
1122 PlatformFileInfoProto entry_file_info; 1145 PlatformFileInfoProto entry_file_info;
1123 util::ConvertPlatformFileInfoToResourceEntry(*file_info, &entry_file_info); 1146 util::ConvertPlatformFileInfoToResourceEntry(*file_info, &entry_file_info);
1124 *entry->mutable_file_info() = entry_file_info; 1147 *entry->mutable_file_info() = entry_file_info;
1125 callback.Run(FILE_ERROR_OK, entry.Pass()); 1148 callback.Run(FILE_ERROR_OK, entry.Pass());
1126 } 1149 }
1127 1150
1128 } // namespace drive 1151 } // namespace drive
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/drive/file_cache_unittest.cc ('k') | chrome/browser/chromeos/drive/file_system/copy_operation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698