| 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.
|
|
|