chrome/browser/chromeos/first_run/first_run.cc - Issue 1326353002: Remove dependency of PrefSyncableService on Profile.

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/chromeos/first_run/first_run.cc

Issue 1326353002: Remove dependency of PrefSyncableService on Profile. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pref_model_associator

Patch Set: Fixing ChromeOS and Linux compilation Created 5 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

« no previous file with comments | « chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc ('k') | chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/first_run/first_run.cc

diff --git a/chrome/browser/chromeos/first_run/first_run.cc b/chrome/browser/chromeos/first_run/first_run.cc

index 81c860d003377e28bbc84e471253b224cbdf81e2..73264ef1947c3d85873adc3c9daeb4bba79a66e5 100644

--- a/chrome/browser/chromeos/first_run/first_run.cc

+++ b/chrome/browser/chromeos/first_run/first_run.cc

@@ -11,6 +11,7 @@

#include "chrome/browser/chromeos/profiles/profile_helper.h"

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/prefs/pref_service_syncable.h"

+#include "chrome/browser/prefs/pref_service_syncable_util.h"

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/browser/ui/extensions/app_launch_params.h"

#include "chrome/browser/ui/extensions/application_launch.h"

@@ -78,7 +79,7 @@ class DialogLauncher : public content::NotificationObserver {

bool first_run_seen =

profile_->GetPrefs()->GetBoolean(prefs::kFirstRunTutorialShown);

bool is_pref_synced =

- PrefServiceSyncable::FromProfile(profile_)->IsPrioritySyncing();

+ PrefServiceSyncableFromProfile(profile_)->IsPrioritySyncing();

bool is_user_ephemeral = user_manager::UserManager::Get()

->IsCurrentUserNonCryptohomeDataEphemeral();

if (!launched_in_telemetry &&