Chromium Code Reviews| Index: ash/shell.cc |
| diff --git a/ash/shell.cc b/ash/shell.cc |
| index 525229c8e6cc076d334e02aebc2ca5f31855576e..dde8c2a1b4db859d7d9a9e14c630635d77af02f4 100644 |
| --- a/ash/shell.cc |
| +++ b/ash/shell.cc |
| @@ -805,9 +805,11 @@ void Shell::Init(const ShellInitParams& init_params) { |
| // Can be null in tests. |
| if (config == Config::MASH && shell_delegate_->GetShellConnector()) { |
| + scoped_refptr<PrefRegistrySimple> pref_registry = |
| + make_scoped_refptr(new PrefRegistrySimple()); |
|
Sam McNally
2017/05/15 22:31:09
I think base::MakeShared might be the new preferre
afakhry
2017/05/16 00:26:58
Done.
|
| + Shell::RegisterPrefs(pref_registry.get()); |
| prefs::ConnectToPrefService( |
| - shell_delegate_->GetShellConnector(), |
| - make_scoped_refptr(new PrefRegistrySimple()), |
| + shell_delegate_->GetShellConnector(), pref_registry, |
|
Sam McNally
2017/05/15 22:31:09
std::move(pref_registry)
afakhry
2017/05/16 00:26:58
Done.
|
| std::vector<PrefValueStore::PrefStoreType>(), |
| base::Bind(&Shell::OnPrefServiceInitialized, base::Unretained(this)), |
| prefs::mojom::kForwarderServiceName); |