Chromium Code Reviews| Index: ash/common/wm_shell.cc |
| diff --git a/ash/common/wm_shell.cc b/ash/common/wm_shell.cc |
| index c0c4268ad0642918b70a373fb64beaacaeacbfb4..523f8fa4150aea723865a91b73386c9fc076230f 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); |
|
sadrul
2016/11/29 17:25:49
I know that you will be removing this change from
jonross
2016/11/30 01:01:31
I've updated this to follow the catalog model.
Ba
|
| + return new PrefObserverStore(std::move(pref_manager_ptr)); |
| +} |
| + |
| +} // namespace |
| + |
| namespace ash { |
| // static |
| @@ -248,6 +261,7 @@ WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate) |
| base::MakeUnique<LocaleNotificationController>()), |
| new_window_client_(base::MakeUnique<NewWindowClientProxy>( |
| delegate_->GetShellConnector())), |
| + pref_store_(CreatePrefObserverStore(delegate_->GetShellConnector())), |
| shelf_controller_(base::MakeUnique<ShelfController>()), |
| shutdown_controller_(base::MakeUnique<ShutdownController>()), |
| system_tray_controller_(base::MakeUnique<SystemTrayController>( |