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

Unified Diff: services/ui/display/screen_manager_ozone_internal.h

Issue 2760453003: Work In Progess
Patch Set: convert local_state to use pre_client_store_ Created 3 years, 9 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 | « services/ui/display/screen_manager.h ('k') | services/ui/display/screen_manager_ozone_internal.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/display/screen_manager_ozone_internal.h
diff --git a/services/ui/display/screen_manager_ozone_internal.h b/services/ui/display/screen_manager_ozone_internal.h
index bb9abff09d09dff97bd0ab29518847449a833817..ec8dc44c8093d1dc10d4efdb62ca2e7957529389 100644
--- a/services/ui/display/screen_manager_ozone_internal.h
+++ b/services/ui/display/screen_manager_ozone_internal.h
@@ -24,12 +24,17 @@
#include "ui/display/manager/display_manager.h"
#include "ui/display/types/display_constants.h"
+#include "components/prefs/pref_store.h"
+#include "services/preferences/public/cpp/pref_client_store.h"
+#include "services/service_manager/public/cpp/connector.h"
+
namespace display {
class DisplayChangeObserver;
class FakeDisplayController;
class ScreenBase;
class TouchTransformController;
+class WindowManager;
// ScreenManagerOzoneInternal provides the necessary functionality to configure
// all attached physical displays on the the ozone platform when operating in
@@ -42,7 +47,8 @@ class ScreenManagerOzoneInternal
public DisplayManager::Delegate,
public service_manager::InterfaceFactory<mojom::DisplayController>,
public service_manager::InterfaceFactory<mojom::OutputProtection>,
- public service_manager::InterfaceFactory<mojom::TestDisplayController> {
+ public service_manager::InterfaceFactory<mojom::TestDisplayController>,
+ public PrefStore::Observer {
public:
ScreenManagerOzoneInternal();
~ScreenManagerOzoneInternal() override;
@@ -51,7 +57,8 @@ class ScreenManagerOzoneInternal
// ScreenManager:
void AddInterfaces(service_manager::InterfaceRegistry* registry) override;
- void Init(ScreenManagerDelegate* delegate) override;
+ void Init(ScreenManagerDelegate* delegate,
+ service_manager::Connector* connector) override;
void RequestCloseDisplay(int64_t display_id) override;
// mojom::TestDisplayController:
@@ -72,6 +79,10 @@ class ScreenManagerOzoneInternal
void RelinquishDisplayControl(
const RelinquishDisplayControlCallback& callback) override;
+ void OnPrefValueChanged(const std::string& key) override;
+ void OnInitializationCompleted(bool succeeded) override;
+ base::DictionaryValue* changed_prefs() { return &changed_prefs_; }
+
private:
friend class ScreenManagerOzoneInternalTest;
@@ -129,6 +140,13 @@ class ScreenManagerOzoneInternal
mojo::BindingSet<mojom::DisplayController> controller_bindings_;
mojo::BindingSet<mojom::TestDisplayController> test_bindings_;
+ service_manager::Connector* connector_;
+ prefs::mojom::PreferencesServiceFactoryPtr pref_factory_ptr;
+ scoped_refptr<preferences::PrefClientStore> pref_client_store_;
+ base::DictionaryValue changed_prefs_;
+ bool initialization_completed_ = false;
+ WindowManager* window_manager_;
+
DISALLOW_COPY_AND_ASSIGN(ScreenManagerOzoneInternal);
};
« no previous file with comments | « services/ui/display/screen_manager.h ('k') | services/ui/display/screen_manager_ozone_internal.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698