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

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

Issue 2669203002: Revert: Remove WindowTreeClientDelegate::GetCaptureClient() and WindowTreeClient::GetCaptureClient() (Closed)
Patch Set: 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 | « services/ui/ws/window_server_test_base.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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 class InFlightVisibleChange; 61 class InFlightVisibleChange;
62 class MusContextFactory; 62 class MusContextFactory;
63 class WindowMus; 63 class WindowMus;
64 class WindowPortMus; 64 class WindowPortMus;
65 class WindowTreeClientDelegate; 65 class WindowTreeClientDelegate;
66 class WindowTreeClientPrivate; 66 class WindowTreeClientPrivate;
67 class WindowTreeClientObserver; 67 class WindowTreeClientObserver;
68 class WindowTreeClientTestObserver; 68 class WindowTreeClientTestObserver;
69 class WindowTreeHostMus; 69 class WindowTreeHostMus;
70 70
71 namespace client {
72 class CaptureClient;
73 }
74
71 using EventResultCallback = base::Callback<void(ui::mojom::EventResult)>; 75 using EventResultCallback = base::Callback<void(ui::mojom::EventResult)>;
72 76
73 // Manages the connection with mus. 77 // Manages the connection with mus.
74 // 78 //
75 // WindowTreeClient is owned by the creator. Generally when the delegate gets 79 // WindowTreeClient is owned by the creator. Generally when the delegate gets
76 // one of OnEmbedRootDestroyed() or OnLostConnection() it should delete the 80 // one of OnEmbedRootDestroyed() or OnLostConnection() it should delete the
77 // WindowTreeClient. 81 // WindowTreeClient.
78 // 82 //
79 // When WindowTreeClient is deleted all windows are deleted (and observers 83 // When WindowTreeClient is deleted all windows are deleted (and observers
80 // notified). 84 // notified).
(...skipping 23 matching lines...) Expand all
104 108
105 service_manager::Connector* connector() { return connector_; } 109 service_manager::Connector* connector() { return connector_; }
106 ui::Gpu* gpu() { return gpu_.get(); } 110 ui::Gpu* gpu() { return gpu_.get(); }
107 CaptureSynchronizer* capture_synchronizer() { 111 CaptureSynchronizer* capture_synchronizer() {
108 return capture_synchronizer_.get(); 112 return capture_synchronizer_.get();
109 } 113 }
110 114
111 bool connected() const { return tree_ != nullptr; } 115 bool connected() const { return tree_ != nullptr; }
112 ClientSpecificId client_id() const { return client_id_; } 116 ClientSpecificId client_id() const { return client_id_; }
113 117
118 client::CaptureClient* GetCaptureClient();
119
114 void SetCanFocus(Window* window, bool can_focus); 120 void SetCanFocus(Window* window, bool can_focus);
115 void SetCanAcceptDrops(Id window_id, bool can_accept_drops); 121 void SetCanAcceptDrops(Id window_id, bool can_accept_drops);
116 void SetEventTargetingPolicy(WindowMus* window, 122 void SetEventTargetingPolicy(WindowMus* window,
117 ui::mojom::EventTargetingPolicy policy); 123 ui::mojom::EventTargetingPolicy policy);
118 void SetPredefinedCursor(WindowMus* window, 124 void SetPredefinedCursor(WindowMus* window,
119 ui::mojom::Cursor old_cursor, 125 ui::mojom::Cursor old_cursor,
120 ui::mojom::Cursor new_cursor); 126 ui::mojom::Cursor new_cursor);
121 void SetWindowTextInputState(WindowMus* window, 127 void SetWindowTextInputState(WindowMus* window,
122 mojo::TextInputStatePtr state); 128 mojo::TextInputStatePtr state);
123 void SetImeVisibility(WindowMus* window, 129 void SetImeVisibility(WindowMus* window,
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 std::unique_ptr<ui::Gpu> gpu_; 548 std::unique_ptr<ui::Gpu> gpu_;
543 std::unique_ptr<MusContextFactory> compositor_context_factory_; 549 std::unique_ptr<MusContextFactory> compositor_context_factory_;
544 base::WeakPtrFactory<WindowTreeClient> weak_factory_; 550 base::WeakPtrFactory<WindowTreeClient> weak_factory_;
545 551
546 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient); 552 DISALLOW_COPY_AND_ASSIGN(WindowTreeClient);
547 }; 553 };
548 554
549 } // namespace aura 555 } // namespace aura
550 556
551 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_ 557 #endif // UI_AURA_MUS_WINDOW_TREE_CLIENT_H_
OLDNEW
« no previous file with comments | « services/ui/ws/window_server_test_base.cc ('k') | ui/aura/mus/window_tree_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698