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

Side by Side Diff: ui/views/mus/mus_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/views/mus/desktop_window_tree_host_mus_unittest.cc ('k') | ui/views/mus/mus_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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_VIEWS_MUS_MUS_CLIENT_H_ 5 #ifndef UI_VIEWS_MUS_MUS_CLIENT_H_
6 #define UI_VIEWS_MUS_MUS_CLIENT_H_ 6 #define UI_VIEWS_MUS_MUS_CLIENT_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
11 #include <string> 11 #include <string>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "ui/aura/client/capture_client.h"
15 #include "ui/aura/mus/window_tree_client_delegate.h" 16 #include "ui/aura/mus/window_tree_client_delegate.h"
16 #include "ui/base/dragdrop/os_exchange_data_provider_factory.h" 17 #include "ui/base/dragdrop/os_exchange_data_provider_factory.h"
17 #include "ui/views/mus/mus_export.h" 18 #include "ui/views/mus/mus_export.h"
18 #include "ui/views/mus/screen_mus_delegate.h" 19 #include "ui/views/mus/screen_mus_delegate.h"
19 #include "ui/views/widget/widget.h" 20 #include "ui/views/widget/widget.h"
20 21
21 namespace aura { 22 namespace aura {
22 class PropertyConverter; 23 class PropertyConverter;
23 class Window; 24 class Window;
24 class WindowTreeClient; 25 class WindowTreeClient;
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 PointerWatcherEventRouter* pointer_watcher_event_router() { 95 PointerWatcherEventRouter* pointer_watcher_event_router() {
95 return pointer_watcher_event_router_.get(); 96 return pointer_watcher_event_router_.get();
96 } 97 }
97 98
98 // Creates DesktopNativeWidgetAura with DesktopWindowTreeHostMus. This is 99 // Creates DesktopNativeWidgetAura with DesktopWindowTreeHostMus. This is
99 // set as the factory function used for creating NativeWidgets when a 100 // set as the factory function used for creating NativeWidgets when a
100 // NativeWidget has not been explicitly set. 101 // NativeWidget has not been explicitly set.
101 NativeWidget* CreateNativeWidget(const Widget::InitParams& init_params, 102 NativeWidget* CreateNativeWidget(const Widget::InitParams& init_params,
102 internal::NativeWidgetDelegate* delegate); 103 internal::NativeWidgetDelegate* delegate);
103 104
105 // Called when the capture client has been set for a window to notify
106 // PointerWatcherEventRouter and CaptureSynchronizer.
107 void OnCaptureClientSet(aura::client::CaptureClient* capture_client);
108
109 // Called when the capture client will be unset for a window to notify
110 // PointerWatcherEventRouter and CaptureSynchronizer.
111 void OnCaptureClientUnset(aura::client::CaptureClient* capture_client);
112
104 void AddObserver(MusClientObserver* observer); 113 void AddObserver(MusClientObserver* observer);
105 void RemoveObserver(MusClientObserver* observer); 114 void RemoveObserver(MusClientObserver* observer);
106 115
107 void SetMusPropertyMirror(std::unique_ptr<MusPropertyMirror> mirror); 116 void SetMusPropertyMirror(std::unique_ptr<MusPropertyMirror> mirror);
108 MusPropertyMirror* mus_property_mirror() { 117 MusPropertyMirror* mus_property_mirror() {
109 return mus_property_mirror_.get(); 118 return mus_property_mirror_.get();
110 } 119 }
111 120
112 private: 121 private:
113 friend class AuraInit; 122 friend class AuraInit;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 162
154 std::unique_ptr<discardable_memory::ClientDiscardableSharedMemoryManager> 163 std::unique_ptr<discardable_memory::ClientDiscardableSharedMemoryManager>
155 discardable_shared_memory_manager_; 164 discardable_shared_memory_manager_;
156 165
157 DISALLOW_COPY_AND_ASSIGN(MusClient); 166 DISALLOW_COPY_AND_ASSIGN(MusClient);
158 }; 167 };
159 168
160 } // namespace views 169 } // namespace views
161 170
162 #endif // UI_VIEWS_MUS_MUS_CLIENT_H_ 171 #endif // UI_VIEWS_MUS_MUS_CLIENT_H_
OLDNEW
« no previous file with comments | « ui/views/mus/desktop_window_tree_host_mus_unittest.cc ('k') | ui/views/mus/mus_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698