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

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

Issue 14348013: Remove legacy in DriveSyncClient. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review fix + alpha Created 7 years, 8 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/chromeos/drive/drive_sync_client_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/drive_system_service.h" 5 #include "chrome/browser/chromeos/drive/drive_system_service.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
11 #include "chrome/browser/chromeos/drive/drive_cache.h"
11 #include "chrome/browser/chromeos/drive/drive_download_handler.h" 12 #include "chrome/browser/chromeos/drive/drive_download_handler.h"
12 #include "chrome/browser/chromeos/drive/drive_file_system.h" 13 #include "chrome/browser/chromeos/drive/drive_file_system.h"
13 #include "chrome/browser/chromeos/drive/drive_file_system_proxy.h" 14 #include "chrome/browser/chromeos/drive/drive_file_system_proxy.h"
14 #include "chrome/browser/chromeos/drive/drive_file_system_util.h" 15 #include "chrome/browser/chromeos/drive/drive_file_system_util.h"
15 #include "chrome/browser/chromeos/drive/drive_prefetcher.h" 16 #include "chrome/browser/chromeos/drive/drive_prefetcher.h"
16 #include "chrome/browser/chromeos/drive/drive_sync_client.h" 17 #include "chrome/browser/chromeos/drive/drive_sync_client.h"
17 #include "chrome/browser/chromeos/drive/drive_webapps_registry.h" 18 #include "chrome/browser/chromeos/drive/drive_webapps_registry.h"
18 #include "chrome/browser/chromeos/drive/event_logger.h" 19 #include "chrome/browser/chromeos/drive/event_logger.h"
19 #include "chrome/browser/chromeos/drive/file_write_helper.h" 20 #include "chrome/browser/chromeos/drive/file_write_helper.h"
20 #include "chrome/browser/chromeos/drive/stale_cache_files_remover.h" 21 #include "chrome/browser/chromeos/drive/stale_cache_files_remover.h"
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 new DriveFileSystem(profile_, 145 new DriveFileSystem(profile_,
145 cache(), 146 cache(),
146 drive_service_.get(), 147 drive_service_.get(),
147 scheduler_.get(), 148 scheduler_.get(),
148 webapps_registry(), 149 webapps_registry(),
149 resource_metadata_.get(), 150 resource_metadata_.get(),
150 blocking_task_runner_)); 151 blocking_task_runner_));
151 file_write_helper_.reset(new FileWriteHelper(file_system())); 152 file_write_helper_.reset(new FileWriteHelper(file_system()));
152 download_handler_.reset(new DriveDownloadHandler(file_write_helper(), 153 download_handler_.reset(new DriveDownloadHandler(file_write_helper(),
153 file_system())); 154 file_system()));
154 sync_client_.reset(new DriveSyncClient(profile_, file_system(), cache())); 155 sync_client_.reset(new DriveSyncClient(file_system(), cache()));
155 prefetcher_.reset(new DrivePrefetcher(file_system(), 156 prefetcher_.reset(new DrivePrefetcher(file_system(),
156 event_logger(), 157 event_logger(),
157 DrivePrefetcherOptions())); 158 DrivePrefetcherOptions()));
158 stale_cache_files_remover_.reset(new StaleCacheFilesRemover(file_system(), 159 stale_cache_files_remover_.reset(new StaleCacheFilesRemover(file_system(),
159 cache())); 160 cache()));
160 } 161 }
161 162
162 DriveSystemService::~DriveSystemService() { 163 DriveSystemService::~DriveSystemService() {
163 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 164 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
164 } 165 }
165 166
166 void DriveSystemService::Initialize() { 167 void DriveSystemService::Initialize() {
167 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 168 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
168 sync_client_->Initialize();
169 drive_service_->Initialize(profile_); 169 drive_service_->Initialize(profile_);
170 file_system_->Initialize(); 170 file_system_->Initialize();
171 cache_->RequestInitialize( 171 cache_->RequestInitialize(
172 base::Bind(&DriveSystemService::InitializeAfterCacheInitialized, 172 base::Bind(&DriveSystemService::InitializeAfterCacheInitialized,
173 weak_ptr_factory_.GetWeakPtr())); 173 weak_ptr_factory_.GetWeakPtr()));
174 } 174 }
175 175
176 void DriveSystemService::Shutdown() { 176 void DriveSystemService::Shutdown() {
177 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 177 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
178 178
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 if (factory_for_test_.is_null()) 472 if (factory_for_test_.is_null())
473 service = new DriveSystemService(profile, NULL, base::FilePath(), NULL); 473 service = new DriveSystemService(profile, NULL, base::FilePath(), NULL);
474 else 474 else
475 service = factory_for_test_.Run(profile); 475 service = factory_for_test_.Run(profile);
476 476
477 service->Initialize(); 477 service->Initialize();
478 return service; 478 return service;
479 } 479 }
480 480
481 } // namespace drive 481 } // namespace drive
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/drive/drive_sync_client_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698