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

Side by Side Diff: chrome/browser/chromeos/login/wallpaper_manager.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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/login/wallpaper_manager.h" 5 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 content::NotificationService::AllSources()); 116 content::NotificationService::AllSources());
117 sequence_token_ = BrowserThread::GetBlockingPool()-> 117 sequence_token_ = BrowserThread::GetBlockingPool()->
118 GetNamedSequenceToken(kWallpaperSequenceTokenName); 118 GetNamedSequenceToken(kWallpaperSequenceTokenName);
119 task_runner_ = BrowserThread::GetBlockingPool()-> 119 task_runner_ = BrowserThread::GetBlockingPool()->
120 GetSequencedTaskRunnerWithShutdownBehavior( 120 GetSequencedTaskRunnerWithShutdownBehavior(
121 sequence_token_, 121 sequence_token_,
122 base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN); 122 base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN);
123 } 123 }
124 124
125 // static 125 // static
126 void WallpaperManager::RegisterPrefs(PrefService* local_state) { 126 void WallpaperManager::RegisterPrefs(PrefServiceSimple* local_state) {
127 local_state->RegisterDictionaryPref(prefs::kUsersWallpaperInfo, 127 local_state->RegisterDictionaryPref(prefs::kUsersWallpaperInfo);
128 PrefService::UNSYNCABLE_PREF); 128 local_state->RegisterDictionaryPref(kUserWallpapers);
129 local_state->RegisterDictionaryPref(kUserWallpapers, 129 local_state->RegisterDictionaryPref(kUserWallpapersProperties);
130 PrefService::UNSYNCABLE_PREF);
131 local_state->RegisterDictionaryPref(kUserWallpapersProperties,
132 PrefService::UNSYNCABLE_PREF);
133 } 130 }
134 131
135 void WallpaperManager::AddObservers() { 132 void WallpaperManager::AddObservers() {
136 if (!DBusThreadManager::Get()->GetRootPowerManagerClient()->HasObserver(this)) 133 if (!DBusThreadManager::Get()->GetRootPowerManagerClient()->HasObserver(this))
137 DBusThreadManager::Get()->GetRootPowerManagerClient()->AddObserver(this); 134 DBusThreadManager::Get()->GetRootPowerManagerClient()->AddObserver(this);
138 system::TimezoneSettings::GetInstance()->AddObserver(this); 135 system::TimezoneSettings::GetInstance()->AddObserver(this);
139 } 136 }
140 137
141 void WallpaperManager::EnsureLoggedInUserWallpaperLoaded() { 138 void WallpaperManager::EnsureLoggedInUserWallpaperLoaded() {
142 WallpaperInfo info; 139 WallpaperInfo info;
(...skipping 769 matching lines...) Expand 10 before | Expand all | Expand 10 after
912 FROM_HERE, 909 FROM_HERE,
913 base::Bind(&WallpaperManager::StartLoad, 910 base::Bind(&WallpaperManager::StartLoad,
914 base::Unretained(this), 911 base::Unretained(this),
915 email, 912 email,
916 info, 913 info,
917 update_wallpaper, 914 update_wallpaper,
918 valid_path)); 915 valid_path));
919 } 916 }
920 917
921 } // chromeos 918 } // chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/wallpaper_manager.h ('k') | chrome/browser/chromeos/login/wizard_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698