chrome/browser/ui/views/browser_actions_container.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/views/browser_actions_container.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/tabs/tab_strip_layout_type_prefs.cc ('k') | chrome/browser/ui/webui/extensions/extension_settings_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/browser_actions_container.cc

diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc

index f312c19b6dba789e8d951924cd190e48bacced62..212c8478a7a43228c833210a7ff264c6680b6d37 100644

--- a/chrome/browser/ui/views/browser_actions_container.cc

+++ b/chrome/browser/ui/views/browser_actions_container.cc

@@ -46,10 +46,10 @@ const int kItemSpacing = ToolbarView::kStandardSpacing;

// Horizontal spacing before the chevron (if visible).

const int kChevronSpacing = kItemSpacing - 2;

-void RegisterUserPrefs(PrefService* prefs) {

+void RegisterUserPrefs(PrefServiceSyncable* prefs) {

prefs->RegisterIntegerPref(prefs::kBrowserActionContainerWidth,

- PrefService::UNSYNCABLE_PREF);

+ PrefServiceSyncable::UNSYNCABLE_PREF);

}

} // namespace

@@ -118,6 +118,9 @@ BrowserActionsContainer::~BrowserActionsContainer() {

void BrowserActionsContainer::Init() {

LoadImages();

+ // TODO(joi): Switch to official way of registering user prefs for

+ // this class, i.e. in a function called from

+ // browser_prefs::RegisterUserPrefs.

if (!profile_->GetPrefs()->FindPreference(

prefs::kBrowserActionContainerWidth))

RegisterUserPrefs(profile_->GetPrefs());