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

Side by Side Diff: ui/aura/mus/window_tree_client.h

Issue 2626013005: Change CaptureSynchronizer and PointerWatcherEventRouter to support multiple CaptureClients. (Closed)
Patch Set: fix leak in test Created 3 years, 10 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 unified diff | Download patch
« no previous file with comments | « ui/aura/mus/capture_synchronizer.cc ('k') | ui/aura/mus/window_tree_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ 5 #ifndef UI_AURA_MUS_WINDOW_TREE_CLIENT_H_
6 #define UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ 6 #define UI_AURA_MUS_WINDOW_TREE_CLIENT_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 ~WindowTreeClient() override; 101 ~WindowTreeClient() override;
102 102
103 // Establishes the connection by way of the WindowTreeFactory. 103 // Establishes the connection by way of the WindowTreeFactory.
104 void ConnectViaWindowTreeFactory(); 104 void ConnectViaWindowTreeFactory();
105 105
106 // Establishes the connection by way of WindowManagerWindowTreeFactory. 106 // Establishes the connection by way of WindowManagerWindowTreeFactory.
107 void ConnectAsWindowManager(); 107 void ConnectAsWindowManager();
108 108
109 service_manager::Connector* connector() { return connector_; } 109 service_manager::Connector* connector() { return connector_; }
110 ui::Gpu* gpu() { return gpu_.get(); } 110 ui::Gpu* gpu() { return gpu_.get(); }
111 CaptureSynchronizer* capture_synchronizer() {
112 return capture_synchronizer_.get();
113 }
111 114
112 bool connected() const { return tree_ != nullptr; } 115 bool connected() const { return tree_ != nullptr; }
113 ClientSpecificId client_id() const { return client_id_; } 116 ClientSpecificId client_id() const { return client_id_; }
114 117
115 client::CaptureClient* GetCaptureClient(); 118 client::CaptureClient* GetCaptureClient();
116 119
117 void SetCanFocus(Window* window, bool can_focus); 120 void SetCanFocus(Window* window, bool can_focus);
118 void SetCanAcceptDrops(Id window_id, bool can_accept_drops); 121 void SetCanAcceptDrops(Id window_id, bool can_accept_drops);
119 void SetCanAcceptEvents(WindowMus* window, bool can_accept_events); 122 void SetCanAcceptEvents(WindowMus* window, bool can_accept_events);
120 void SetPredefinedCursor(WindowMus* window, 123 void SetPredefinedCursor(WindowMus* window,
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 std::unique_ptr<ui::Gpu> gpu_; 547 std::unique_ptr<ui::Gpu> gpu_;
545 std::unique_ptr<MusContextFactory> compositor_context_factory_; 548 std::unique_ptr<MusContextFactory> compositor_context_factory_;
546 base::WeakPtrFactory<WindowTreeClient> weak_factory_; 549 base::WeakPtrFactory<WindowTreeClient> weak_factory_;
547 550
548 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); 551 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient);
549 }; 552 };
550 553
551 } // namespace aura 554 } // namespace aura
552 555
553 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ 556 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_
OLDNEW
« no previous file with comments | « ui/aura/mus/capture_synchronizer.cc ('k') | ui/aura/mus/window_tree_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698