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

Unified Diff: chrome/browser/ui/views/browser_actions_container.cc

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again; base::File changes conflicted. Created 7 years, 10 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/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 f9cd7e5ec4a7e0ef72fec09f1c5808c41cd7916c..e440ecbc7fd42a7e5950fd104ae4f86b75496036 100644
--- a/chrome/browser/ui/views/browser_actions_container.cc
+++ b/chrome/browser/ui/views/browser_actions_container.cc
@@ -9,6 +9,7 @@
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/tab_helper.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sessions/session_tab_helper.h"
@@ -46,10 +47,10 @@ const int kItemSpacing = ToolbarView::kStandardSpacing;
// Horizontal spacing before the chevron (if visible).
const int kChevronSpacing = kItemSpacing - 2;
-void RegisterUserPrefs(PrefServiceSyncable* prefs) {
- prefs->RegisterIntegerPref(prefs::kBrowserActionContainerWidth,
- 0,
- PrefServiceSyncable::UNSYNCABLE_PREF);
+void RegisterUserPrefs(PrefRegistrySyncable* registry) {
+ registry->RegisterIntegerPref(prefs::kBrowserActionContainerWidth,
+ 0,
+ PrefRegistrySyncable::UNSYNCABLE_PREF);
}
} // namespace
@@ -123,7 +124,8 @@ void BrowserActionsContainer::Init() {
// browser_prefs::RegisterUserPrefs.
if (!profile_->GetPrefs()->FindPreference(
prefs::kBrowserActionContainerWidth))
- RegisterUserPrefs(profile_->GetPrefs());
+ RegisterUserPrefs(static_cast<PrefRegistrySyncable*>(
+ profile_->GetPrefs()->DeprecatedGetPrefRegistry()));
// We wait to set the container width until now so that the chevron images
// will be loaded. The width calculation needs to know the chevron size.
« no previous file with comments | « chrome/browser/ui/tabs/pinned_tab_codec.cc ('k') | chrome/browser/ui/webui/extensions/extension_settings_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698