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

Unified Diff: ash/shell.cc

Issue 2802093005: Have ActiveProfilePrefService Use the Original Profile (Closed)
Patch Set: Created 3 years, 8 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 | « no previous file | chrome/browser/prefs/active_profile_pref_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 053206c24131ffce4234d8de42c2171e63b50d0d..4f05794853cae2ae80eab7810430647424bd399c 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -791,8 +791,6 @@ void Shell::Init(const ShellInitParams& init_params) {
wallpaper_delegate_ = shell_delegate_->CreateWallpaperDelegate();
// Can be null in tests.
- // TODO(jonross): reenable once the cause of crbug.com/707321 is determined.
- /*
if (wm_shell_->IsRunningInMash() && shell_delegate_->GetShellConnector()) {
prefs::ConnectToPrefService(
shell_delegate_->GetShellConnector(),
@@ -800,7 +798,7 @@ void Shell::Init(const ShellInitParams& init_params) {
std::vector<PrefValueStore::PrefStoreType>(),
base::Bind(&Shell::OnPrefServiceInitialized, base::Unretained(this)),
prefs::mojom::kForwarderServiceName);
- }*/
+ }
// Some delegates access WmShell during their construction. Create them here
// instead of the WmShell constructor.
« no previous file with comments | « no previous file | chrome/browser/prefs/active_profile_pref_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698