chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc - Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

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/ui/ash/launcher/chrome_launcher_controller_per_app.cc

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 8 years 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/ui/ash/event_rewriter_unittest.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc

index e8f17ec5c61740e3abe4ee85c87dfe5f48bd2497..1c36328c40020131c63ef040e30a67b53e603600 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.cc

@@ -131,7 +131,7 @@ std::string GetPrefForRootWindow(PrefService* pref_service,

// If prefs have synced and no user-set value exists at |local_path|, the value

// from |synced_path| is copied to |local_path|.

-void MaybePropagatePrefToLocal(PrefService* pref_service,

+void MaybePropagatePrefToLocal(PrefServiceSyncable* pref_service,

const char* local_path,

const char* synced_path) {

if (!pref_service->FindPreference(local_path)->HasUserSetting() &&

@@ -222,7 +222,7 @@ void ChromeLauncherControllerPerApp::Init() {

if (ash::Shell::HasInstance()) {

SetShelfAutoHideBehaviorFromPrefs();

SetShelfAlignmentFromPrefs();

- PrefService* prefs = profile_->GetPrefs();

+ PrefServiceSyncable* prefs = profile_->GetPrefs();

if (!prefs->FindPreference(prefs::kShelfAlignmentLocal)->HasUserSetting() ||

!prefs->FindPreference(prefs::kShelfAutoHideBehaviorLocal)->

HasUserSetting()) {