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

Unified Diff: services/ui/ws/window_server.h

Issue 2916823002: Move Mus into chrome's process when running with --mus.
Patch Set: Addressing most feedback, making this work on device. Created 3 years, 6 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
Index: services/ui/ws/window_server.h
diff --git a/services/ui/ws/window_server.h b/services/ui/ws/window_server.h
index df851a4d5bd5d792d3759e8fbcfe339c5e5ebaf5..6c16c5a94be1a2ad85f6197d4762e13b10c0bbed 100644
--- a/services/ui/ws/window_server.h
+++ b/services/ui/ws/window_server.h
@@ -53,11 +53,16 @@ class WindowServer : public ServerWindowDelegate,
public UserIdTrackerObserver,
public cc::mojom::FrameSinkManagerClient {
public:
- explicit WindowServer(WindowServerDelegate* delegate);
+ WindowServer(WindowServerDelegate* delegate,
+ scoped_refptr<base::SingleThreadTaskRunner>& resource_runner);
~WindowServer() override;
WindowServerDelegate* delegate() { return delegate_; }
+ scoped_refptr<base::SingleThreadTaskRunner>& resource_runner() {
+ return resource_runner_;
+ }
+
UserIdTracker* user_id_tracker() { return &user_id_tracker_; }
const UserIdTracker* user_id_tracker() const { return &user_id_tracker_; }
@@ -370,6 +375,8 @@ class WindowServer : public ServerWindowDelegate,
WindowServerDelegate* delegate_;
+ scoped_refptr<base::SingleThreadTaskRunner> resource_runner_;
+
// ID to use for next WindowTree.
ClientSpecificId next_client_id_;

Powered by Google App Engine
This is Rietveld 408576698