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

Unified Diff: ash/common/wm_shell.cc

Issue 2474653003: PreferencesManager (Closed)
Patch Set: WmShell Owns PrefObserverStore Created 4 years, 1 month 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
Index: ash/common/wm_shell.cc
diff --git a/ash/common/wm_shell.cc b/ash/common/wm_shell.cc
index c0c4268ad0642918b70a373fb64beaacaeacbfb4..8c1af4416a08340a40ed64bef12adb985661443d 100644
--- a/ash/common/wm_shell.cc
+++ b/ash/common/wm_shell.cc
@@ -44,6 +44,8 @@
#include "base/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
+#include "services/preferences/public/cpp/pref_observer_store.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "ui/app_list/presenter/app_list_presenter.h"
#include "ui/display/display.h"
#include "ui/views/focus/focus_manager_factory.h"
@@ -54,6 +56,17 @@
#include "ash/common/system/chromeos/session/logout_confirmation_controller.h"
#endif
+namespace {
+
+PrefObserverStore* CreatePrefObserverStore(
+ service_manager::Connector* connector) {
+ prefs::mojom::PreferencesManagerPtr pref_manager_ptr;
+ connector->ConnectToInterface("content_browser", &pref_manager_ptr);
+ return new PrefObserverStore(std::move(pref_manager_ptr));
+}
+
+} // namespace
+
namespace ash {
// static
@@ -248,6 +261,8 @@ WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate)
base::MakeUnique<LocaleNotificationController>()),
new_window_client_(base::MakeUnique<NewWindowClientProxy>(
delegate_->GetShellConnector())),
+ pref_observer_store_(
+ CreatePrefObserverStore(delegate_->GetShellConnector())),
shelf_controller_(base::MakeUnique<ShelfController>()),
shutdown_controller_(base::MakeUnique<ShutdownController>()),
system_tray_controller_(base::MakeUnique<SystemTrayController>(
« ash/common/wm_shell.h ('K') | « ash/common/wm_shell.h ('k') | chrome/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698