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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller.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/sync/chrome_sync_client.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
index 7f722279aafcc2de45f7435d39d61bbbb44e401a..2882397136c40ddd17ae9046f4a10fa421ff43ce 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
@@ -33,6 +33,7 @@
#include "chrome/browser/extensions/launch_util.h"
#include "chrome/browser/prefs/incognito_mode_prefs.h"
#include "chrome/browser/prefs/pref_service_syncable.h"
+#include "chrome/browser/prefs/pref_service_syncable_util.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/ash/app_sync_ui_state.h"
@@ -478,7 +479,7 @@ void ChromeLauncherController::Init() {
#if defined(OS_CHROMEOS)
SetVirtualKeyboardBehaviorFromPrefs();
#endif // defined(OS_CHROMEOS)
- PrefServiceSyncable* prefs = PrefServiceSyncable::FromProfile(profile_);
+ PrefServiceSyncable* prefs = PrefServiceSyncableFromProfile(profile_);
if (!prefs->FindPreference(prefs::kShelfAlignmentLocal)->HasUserSetting() ||
!prefs->FindPreference(prefs::kShelfAutoHideBehaviorLocal)->
HasUserSetting()) {
@@ -1238,7 +1239,7 @@ void ChromeLauncherController::OnDisplayConfigurationChanged() {
}
void ChromeLauncherController::OnIsSyncingChanged() {
- PrefServiceSyncable* prefs = PrefServiceSyncable::FromProfile(profile_);
+ PrefServiceSyncable* prefs = PrefServiceSyncableFromProfile(profile_);
MaybePropagatePrefToLocal(prefs,
prefs::kShelfAlignmentLocal,
prefs::kShelfAlignment);
@@ -2102,7 +2103,7 @@ void ChromeLauncherController::ReleaseProfile() {
extensions::ExtensionRegistry::Get(profile_)->RemoveObserver(this);
- PrefServiceSyncable::FromProfile(profile_)->RemoveObserver(this);
+ PrefServiceSyncableFromProfile(profile_)->RemoveObserver(this);
pref_change_registrar_.RemoveAll();
}
« no previous file with comments | « chrome/browser/sync/chrome_sync_client.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698