chrome/browser/extensions/api/preferences_private/preferences_private_api.cc - Issue 1155443009: [Sync] Rename SyncActive to IsSyncActive.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/preferences_private/preferences_private_api.cc

Issue 1155443009: [Sync] Rename SyncActive to IsSyncActive. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: More non-android cases. Created 5 years, 7 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

« no previous file with comments | « chrome/browser/android/most_visited_sites.cc ('k') | chrome/browser/extensions/api/preferences_private/preferences_private_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/preferences_private/preferences_private_api.cc

diff --git a/chrome/browser/extensions/api/preferences_private/preferences_private_api.cc b/chrome/browser/extensions/api/preferences_private/preferences_private_api.cc

index 6b1d727e8fee9d96d6f66ce34a761e25ff2d09b6..3b1ccc8bd720658c02add2fbd59afb496466e287 100644

--- a/chrome/browser/extensions/api/preferences_private/preferences_private_api.cc

+++ b/chrome/browser/extensions/api/preferences_private/preferences_private_api.cc

@@ -25,7 +25,7 @@ void

PreferencesPrivateGetSyncCategoriesWithoutPassphraseFunction::OnStateChanged() {

ProfileSyncService* sync_service =

ProfileSyncServiceFactory::GetForProfile(GetProfile());

- if (sync_service->SyncActive()) {

+ if (sync_service->IsSyncActive()) {

sync_service->RemoveObserver(this);

RunAsync();

Release(); // Balanced in RunAsync().

@@ -37,7 +37,7 @@ bool PreferencesPrivateGetSyncCategoriesWithoutPassphraseFunction::RunAsync() {

ProfileSyncServiceFactory::GetForProfile(GetProfile());

if (!sync_service)

return false;

- if (!sync_service->SyncActive()) {

+ if (!sync_service->IsSyncActive()) {

AddRef(); // Balanced in OnStateChanged().

sync_service->AddObserver(this);

return true;