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

Side by Side Diff: ui/views/mus/mus_client.h

Issue 2548423002: Hosting the discardable memory service in the mus process (Closed)
Patch Set: Rebase Created 4 years 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/DEPS ('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/mus/window_tree_client_delegate.h" 15 #include "ui/aura/mus/window_tree_client_delegate.h"
16 #include "ui/base/dragdrop/os_exchange_data_provider_factory.h" 16 #include "ui/base/dragdrop/os_exchange_data_provider_factory.h"
17 #include "ui/views/mus/mus_export.h" 17 #include "ui/views/mus/mus_export.h"
18 #include "ui/views/mus/screen_mus_delegate.h" 18 #include "ui/views/mus/screen_mus_delegate.h"
19 #include "ui/views/widget/widget.h" 19 #include "ui/views/widget/widget.h"
20 20
21 namespace aura { 21 namespace aura {
22 class PropertyConverter; 22 class PropertyConverter;
23 class MusContextFactory; 23 class MusContextFactory;
24 class Window; 24 class Window;
25 class WindowTreeClient; 25 class WindowTreeClient;
26 } 26 }
27 27
28 namespace base { 28 namespace base {
29 class SingleThreadTaskRunner; 29 class SingleThreadTaskRunner;
30 class Thread;
31 }
32
33 namespace discardable_memory {
34 class ClientDiscardableSharedMemoryManager;
30 } 35 }
31 36
32 namespace service_manager { 37 namespace service_manager {
33 class Connector; 38 class Connector;
34 class Identity; 39 class Identity;
35 } 40 }
36 41
37 namespace ui { 42 namespace ui {
38 class Gpu; 43 class Gpu;
39 } 44 }
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 gfx::Point GetCursorScreenPoint() override; 130 gfx::Point GetCursorScreenPoint() override;
126 aura::Window* GetWindowAtScreenPoint(const gfx::Point& point) override; 131 aura::Window* GetWindowAtScreenPoint(const gfx::Point& point) override;
127 132
128 // ui:OSExchangeDataProviderFactory::Factory: 133 // ui:OSExchangeDataProviderFactory::Factory:
129 std::unique_ptr<OSExchangeData::Provider> BuildProvider() override; 134 std::unique_ptr<OSExchangeData::Provider> BuildProvider() override;
130 135
131 static MusClient* instance_; 136 static MusClient* instance_;
132 137
133 service_manager::Identity identity_; 138 service_manager::Identity identity_;
134 139
140 std::unique_ptr<base::Thread> io_thread_;
141
135 base::ObserverList<MusClientObserver> observer_list_; 142 base::ObserverList<MusClientObserver> observer_list_;
136 143
137 // NOTE: this may be null (creation is based on argument supplied to 144 // NOTE: this may be null (creation is based on argument supplied to
138 // constructor). 145 // constructor).
139 std::unique_ptr<wm::WMState> wm_state_; 146 std::unique_ptr<wm::WMState> wm_state_;
140 147
141 std::unique_ptr<ScreenMus> screen_; 148 std::unique_ptr<ScreenMus> screen_;
142 149
143 std::unique_ptr<aura::PropertyConverter> property_converter_; 150 std::unique_ptr<aura::PropertyConverter> property_converter_;
144 151
145 std::unique_ptr<aura::WindowTreeClient> window_tree_client_; 152 std::unique_ptr<aura::WindowTreeClient> window_tree_client_;
146 153
147 std::unique_ptr<ui::Gpu> gpu_; 154 std::unique_ptr<ui::Gpu> gpu_;
148 155
149 std::unique_ptr<PointerWatcherEventRouter2> pointer_watcher_event_router_; 156 std::unique_ptr<PointerWatcherEventRouter2> pointer_watcher_event_router_;
150 157
151 std::unique_ptr<aura::MusContextFactory> compositor_context_factory_; 158 std::unique_ptr<aura::MusContextFactory> compositor_context_factory_;
152 159
160 std::unique_ptr<discardable_memory::ClientDiscardableSharedMemoryManager>
161 discardable_shared_memory_manager_;
162
153 DISALLOW_COPY_AND_ASSIGN(MusClient); 163 DISALLOW_COPY_AND_ASSIGN(MusClient);
154 }; 164 };
155 165
156 } // namespace views 166 } // namespace views
157 167
158 #endif // UI_VIEWS_MUS_MUS_CLIENT_H_ 168 #endif // UI_VIEWS_MUS_MUS_CLIENT_H_
OLDNEW
« no previous file with comments | « ui/views/mus/DEPS ('k') | ui/views/mus/mus_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698