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

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

Issue 127683002: Less dependency for DriveAppRegistry. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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_integration_service.h" 5 #include "chrome/browser/chromeos/drive/drive_integration_service.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/prefs/pref_change_registrar.h" 9 #include "base/prefs/pref_change_registrar.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 drive_service_.get(), 246 drive_service_.get(),
247 blocking_task_runner_.get())); 247 blocking_task_runner_.get()));
248 metadata_storage_.reset(new internal::ResourceMetadataStorage( 248 metadata_storage_.reset(new internal::ResourceMetadataStorage(
249 cache_root_directory_.Append(kMetadataDirectory), 249 cache_root_directory_.Append(kMetadataDirectory),
250 blocking_task_runner_.get())); 250 blocking_task_runner_.get()));
251 cache_.reset(new internal::FileCache( 251 cache_.reset(new internal::FileCache(
252 metadata_storage_.get(), 252 metadata_storage_.get(),
253 cache_root_directory_.Append(kCacheFileDirectory), 253 cache_root_directory_.Append(kCacheFileDirectory),
254 blocking_task_runner_.get(), 254 blocking_task_runner_.get(),
255 NULL /* free_disk_space_getter */)); 255 NULL /* free_disk_space_getter */));
256 drive_app_registry_.reset(new DriveAppRegistry(scheduler_.get())); 256 drive_app_registry_.reset(new DriveAppRegistry(drive_service_.get()));
257 257
258 resource_metadata_.reset(new internal::ResourceMetadata( 258 resource_metadata_.reset(new internal::ResourceMetadata(
259 metadata_storage_.get(), blocking_task_runner_)); 259 metadata_storage_.get(), blocking_task_runner_));
260 260
261 file_system_.reset( 261 file_system_.reset(
262 test_file_system ? test_file_system : new FileSystem( 262 test_file_system ? test_file_system : new FileSystem(
263 profile_->GetPrefs(), 263 profile_->GetPrefs(),
264 cache_.get(), 264 cache_.get(),
265 drive_service_.get(), 265 drive_service_.get(),
266 scheduler_.get(), 266 scheduler_.get(),
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
608 service = new DriveIntegrationService(profile, preference_watcher, 608 service = new DriveIntegrationService(profile, preference_watcher,
609 NULL, base::FilePath(), NULL); 609 NULL, base::FilePath(), NULL);
610 } else { 610 } else {
611 service = factory_for_test_.Run(profile); 611 service = factory_for_test_.Run(profile);
612 } 612 }
613 613
614 return service; 614 return service;
615 } 615 }
616 616
617 } // namespace drive 617 } // namespace drive
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698