PreferencesManager

ash/common/wm_shell.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/wm_shell.h"
 
 #include <utility>
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/accelerators/ash_focus_manager_factory.h"
@@ skipping 26 matching lines @@
 #include "ash/common/wm/overview/window_selector_controller.h"
 #include "ash/common/wm/root_window_finder.h"
 #include "ash/common/wm/system_modal_container_layout_manager.h"
 #include "ash/common/wm/window_cycle_controller.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #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"
 
 #if defined(OS_CHROMEOS)
 #include "ash/common/system/chromeos/brightness/brightness_controller_chromeos.h"
 #include "ash/common/system/chromeos/keyboard_brightness_controller.h"
 #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 this CL. But ...

I think the better way of doing this would be to go through the catalog service
(see
https://cs.chromium.org/chromium/src/services/ui/ime/ime_server_impl.cc?type=...),
instead of directly connecting to content_browser, if possible.

[jonross, 2016/11/30 01:01:31]

I've updated this to follow the catalog model.

Based on the feedback from jamescook@ & msw@ I'm considering landing the WmShell
portion of the code with this change. I would still revert the ShelfController
example. 

This would then allow followup patches to independently start using the
chrome-ash connection established here.

Thoughts?

+  return new PrefObserverStore(std::move(pref_manager_ptr));
+}
+
+}  // namespace
+
 namespace ash {
 
 // static
 WmShell* WmShell::instance_ = nullptr;
 
 // static
 void WmShell::Set(WmShell* instance) {
   instance_ = instance;
 }
 
@@ skipping 174 matching lines @@
 }
 
 WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate)
     : delegate_(std::move(shell_delegate)),
       focus_cycler_(base::MakeUnique<FocusCycler>()),
       immersive_context_(base::MakeUnique<ImmersiveContextAsh>()),
       locale_notification_controller_(
           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>(
           delegate_->GetShellConnector())),
       system_tray_notifier_(base::MakeUnique<SystemTrayNotifier>()),
       wallpaper_delegate_(delegate_->CreateWallpaperDelegate()),
       window_cycle_controller_(base::MakeUnique<WindowCycleController>()),
       window_selector_controller_(
           base::MakeUnique<WindowSelectorController>()) {
 #if defined(OS_CHROMEOS)
@@ skipping 137 matching lines @@
 void WmShell::DeleteToastManager() {
   toast_manager_.reset();
 }
 
 void WmShell::SetAcceleratorController(
     std::unique_ptr<AcceleratorController> accelerator_controller) {
   accelerator_controller_ = std::move(accelerator_controller);
 }
 
 }  // namespace ash