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

Unified Diff: ash/shell.cc

Issue 2879243003: Regsiter Ash prefs in mash (Closed)
Patch Set: Created 3 years, 7 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 | no next file » | 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 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);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698