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

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/sync_engine.cc

Issue 610223002: [SyncFS] Use nullptr instead of NULL (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
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/sync_file_system/drive_backend/sync_engine.h" 5 #include "chrome/browser/sync_file_system/drive_backend/sync_engine.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 worker_task_runner.get(), 220 worker_task_runner.get(),
221 drive_task_runner.get(), 221 drive_task_runner.get(),
222 GetSyncFileSystemDir(context->GetPath()), 222 GetSyncFileSystemDir(context->GetPath()),
223 task_logger, 223 task_logger,
224 notification_manager, 224 notification_manager,
225 extension_service, 225 extension_service,
226 signin_manager, 226 signin_manager,
227 token_service, 227 token_service,
228 request_context.get(), 228 request_context.get(),
229 make_scoped_ptr(new DriveServiceFactory()), 229 make_scoped_ptr(new DriveServiceFactory()),
230 NULL /* env_override */)); 230 nullptr /* env_override */));
231 231
232 sync_engine->Initialize(); 232 sync_engine->Initialize();
233 return sync_engine.Pass(); 233 return sync_engine.Pass();
234 } 234 }
235 235
236 void SyncEngine::AppendDependsOnFactories( 236 void SyncEngine::AppendDependsOnFactories(
237 std::set<BrowserContextKeyedServiceFactory*>* factories) { 237 std::set<BrowserContextKeyedServiceFactory*>* factories) {
238 DCHECK(factories); 238 DCHECK(factories);
239 factories->insert(drive::DriveNotificationManagerFactory::GetInstance()); 239 factories->insert(drive::DriveNotificationManagerFactory::GetInstance());
240 factories->insert(SigninManagerFactory::GetInstance()); 240 factories->insert(SigninManagerFactory::GetInstance());
(...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after
751 worker_task_runner_(worker_task_runner), 751 worker_task_runner_(worker_task_runner),
752 drive_task_runner_(drive_task_runner), 752 drive_task_runner_(drive_task_runner),
753 sync_file_system_dir_(sync_file_system_dir), 753 sync_file_system_dir_(sync_file_system_dir),
754 task_logger_(task_logger), 754 task_logger_(task_logger),
755 notification_manager_(notification_manager), 755 notification_manager_(notification_manager),
756 extension_service_(extension_service), 756 extension_service_(extension_service),
757 signin_manager_(signin_manager), 757 signin_manager_(signin_manager),
758 token_service_(token_service), 758 token_service_(token_service),
759 request_context_(request_context), 759 request_context_(request_context),
760 drive_service_factory_(drive_service_factory.Pass()), 760 drive_service_factory_(drive_service_factory.Pass()),
761 remote_change_processor_(NULL), 761 remote_change_processor_(nullptr),
762 service_state_(REMOTE_SERVICE_TEMPORARY_UNAVAILABLE), 762 service_state_(REMOTE_SERVICE_TEMPORARY_UNAVAILABLE),
763 has_refresh_token_(false), 763 has_refresh_token_(false),
764 network_available_(false), 764 network_available_(false),
765 sync_enabled_(false), 765 sync_enabled_(false),
766 env_override_(env_override), 766 env_override_(env_override),
767 weak_ptr_factory_(this) { 767 weak_ptr_factory_(this) {
768 DCHECK(sync_file_system_dir_.IsAbsolute()); 768 DCHECK(sync_file_system_dir_.IsAbsolute());
769 if (notification_manager_) 769 if (notification_manager_)
770 notification_manager_->AddObserver(this); 770 notification_manager_->AddObserver(this);
771 if (signin_manager_) 771 if (signin_manager_)
(...skipping 29 matching lines...) Expand all
801 801
802 SyncStatusCallback SyncEngine::TrackCallback( 802 SyncStatusCallback SyncEngine::TrackCallback(
803 const SyncStatusCallback& callback) { 803 const SyncStatusCallback& callback) {
804 return callback_tracker_.Register( 804 return callback_tracker_.Register(
805 base::Bind(callback, SYNC_STATUS_ABORT), 805 base::Bind(callback, SYNC_STATUS_ABORT),
806 callback); 806 callback);
807 } 807 }
808 808
809 } // namespace drive_backend 809 } // namespace drive_backend
810 } // namespace sync_file_system 810 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698