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

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

Issue 14118006: Change owner of DriveScheduler from DriveFileSystem to DriveSystemService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase 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
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"
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 g_browser_process->system_request_context(), 120 g_browser_process->system_request_context(),
121 GURL(google_apis::DriveApiUrlGenerator::kBaseUrlForProduction), 121 GURL(google_apis::DriveApiUrlGenerator::kBaseUrlForProduction),
122 GURL(google_apis::GDataWapiUrlGenerator::kBaseUrlForProduction), 122 GURL(google_apis::GDataWapiUrlGenerator::kBaseUrlForProduction),
123 GetDriveUserAgent())); 123 GetDriveUserAgent()));
124 } else { 124 } else {
125 drive_service_.reset(new google_apis::GDataWapiService( 125 drive_service_.reset(new google_apis::GDataWapiService(
126 g_browser_process->system_request_context(), 126 g_browser_process->system_request_context(),
127 GURL(google_apis::GDataWapiUrlGenerator::kBaseUrlForProduction), 127 GURL(google_apis::GDataWapiUrlGenerator::kBaseUrlForProduction),
128 GetDriveUserAgent())); 128 GetDriveUserAgent()));
129 } 129 }
130 scheduler_.reset(new DriveScheduler(profile_, drive_service_.get()));
130 cache_.reset(new DriveCache(!test_cache_root.empty() ? test_cache_root : 131 cache_.reset(new DriveCache(!test_cache_root.empty() ? test_cache_root :
131 DriveCache::GetCacheRootPath(profile), 132 DriveCache::GetCacheRootPath(profile),
132 blocking_task_runner_, 133 blocking_task_runner_,
133 NULL /* free_disk_space_getter */)); 134 NULL /* free_disk_space_getter */));
134 webapps_registry_.reset(new DriveWebAppsRegistry); 135 webapps_registry_.reset(new DriveWebAppsRegistry);
135 136
136 // We can call DriveCache::GetCacheDirectoryPath safely even before the cache 137 // We can call DriveCache::GetCacheDirectoryPath safely even before the cache
137 // gets initialized. 138 // gets initialized.
138 resource_metadata_.reset(new DriveResourceMetadata( 139 resource_metadata_.reset(new DriveResourceMetadata(
139 cache_->GetCacheDirectoryPath(DriveCache::CACHE_TYPE_META), 140 cache_->GetCacheDirectoryPath(DriveCache::CACHE_TYPE_META),
140 blocking_task_runner_)); 141 blocking_task_runner_));
141 142
142 file_system_.reset(test_file_system ? test_file_system : 143 file_system_.reset(test_file_system ? test_file_system :
143 new DriveFileSystem(profile_, 144 new DriveFileSystem(profile_,
144 cache(), 145 cache(),
145 drive_service_.get(), 146 drive_service_.get(),
147 scheduler_.get(),
146 webapps_registry(), 148 webapps_registry(),
147 resource_metadata_.get(), 149 resource_metadata_.get(),
148 blocking_task_runner_)); 150 blocking_task_runner_));
149 file_write_helper_.reset(new FileWriteHelper(file_system())); 151 file_write_helper_.reset(new FileWriteHelper(file_system()));
150 download_handler_.reset(new DriveDownloadHandler(file_write_helper(), 152 download_handler_.reset(new DriveDownloadHandler(file_write_helper(),
151 file_system())); 153 file_system()));
152 sync_client_.reset(new DriveSyncClient(profile_, file_system(), cache())); 154 sync_client_.reset(new DriveSyncClient(profile_, file_system(), cache()));
153 prefetcher_.reset(new DrivePrefetcher(file_system(), 155 prefetcher_.reset(new DrivePrefetcher(file_system(),
154 event_logger(), 156 event_logger(),
155 DrivePrefetcherOptions())); 157 DrivePrefetcherOptions()));
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 if (factory_for_test_.is_null()) 472 if (factory_for_test_.is_null())
471 service = new DriveSystemService(profile, NULL, base::FilePath(), NULL); 473 service = new DriveSystemService(profile, NULL, base::FilePath(), NULL);
472 else 474 else
473 service = factory_for_test_.Run(profile); 475 service = factory_for_test_.Run(profile);
474 476
475 service->Initialize(); 477 service->Initialize();
476 return service; 478 return service;
477 } 479 }
478 480
479 } // namespace drive 481 } // namespace drive
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698