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

Unified Diff: chrome/browser/sync/profile_sync_service_factory.cc

Issue 2354613002: [Sync] Fix namespaces for the browser_sync component. (Closed)
Patch Set: Address comments. Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/profile_sync_service_factory.cc
diff --git a/chrome/browser/sync/profile_sync_service_factory.cc b/chrome/browser/sync/profile_sync_service_factory.cc
index c0d09dab39d5ca042fb3c9dcc87fe50b67695e72..f0bc5f64785e5a67f0f4f77eef9e81e2d52f7529 100644
--- a/chrome/browser/sync/profile_sync_service_factory.cc
+++ b/chrome/browser/sync/profile_sync_service_factory.cc
@@ -52,6 +52,8 @@
#include "chrome/browser/ui/global_error/global_error_service_factory.h"
#endif
+using browser_sync::ProfileSyncService;
+
namespace {
void UpdateNetworkTimeOnUIThread(base::Time network_time,
@@ -82,7 +84,7 @@ ProfileSyncServiceFactory* ProfileSyncServiceFactory::GetInstance() {
ProfileSyncService* ProfileSyncServiceFactory::GetForProfile(
Profile* profile) {
if (!ProfileSyncService::IsSyncAllowedByFlag())
- return NULL;
+ return nullptr;
return static_cast<ProfileSyncService*>(
GetInstance()->GetServiceForBrowserContext(profile, true));
@@ -198,7 +200,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceInstanceFor(
// static
bool ProfileSyncServiceFactory::HasProfileSyncService(Profile* profile) {
- return GetInstance()->GetServiceForBrowserContext(profile, false) != NULL;
+ return GetInstance()->GetServiceForBrowserContext(profile, false) != nullptr;
}
// static
« no previous file with comments | « chrome/browser/sync/profile_sync_service_factory.h ('k') | chrome/browser/sync/profile_sync_service_factory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698