| OLD | NEW |
| 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 #include "ui/views/mus/mus_client.h" | 5 #include "ui/views/mus/mus_client.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
| 9 #include "base/threading/thread.h" | 9 #include "base/threading/thread.h" |
| 10 #include "components/discardable_memory/client/client_discardable_shared_memory_
manager.h" | 10 #include "components/discardable_memory/client/client_discardable_shared_memory_
manager.h" |
| 11 #include "services/service_manager/public/cpp/connection.h" | 11 #include "services/service_manager/public/cpp/connection.h" |
| 12 #include "services/service_manager/public/cpp/connector.h" | 12 #include "services/service_manager/public/cpp/connector.h" |
| 13 #include "services/ui/public/cpp/gpu/gpu.h" | 13 #include "services/ui/public/cpp/gpu/gpu.h" |
| 14 #include "services/ui/public/cpp/property_type_converters.h" | 14 #include "services/ui/public/cpp/property_type_converters.h" |
| 15 #include "services/ui/public/interfaces/constants.mojom.h" | 15 #include "services/ui/public/interfaces/constants.mojom.h" |
| 16 #include "services/ui/public/interfaces/event_matcher.mojom.h" | 16 #include "services/ui/public/interfaces/event_matcher.mojom.h" |
| 17 #include "services/ui/public/interfaces/window_manager.mojom.h" | 17 #include "services/ui/public/interfaces/window_manager.mojom.h" |
| 18 #include "ui/aura/env.h" | 18 #include "ui/aura/env.h" |
| 19 #include "ui/aura/mus/mus_context_factory.h" | 19 #include "ui/aura/mus/mus_context_factory.h" |
| 20 #include "ui/aura/mus/os_exchange_data_provider_mus.h" | 20 #include "ui/aura/mus/os_exchange_data_provider_mus.h" |
| 21 #include "ui/aura/mus/property_converter.h" | 21 #include "ui/aura/mus/property_converter.h" |
| 22 #include "ui/aura/mus/window_tree_client.h" | 22 #include "ui/aura/mus/window_tree_client.h" |
| 23 #include "ui/aura/mus/window_tree_host_mus.h" | 23 #include "ui/aura/mus/window_tree_host_mus.h" |
| 24 #include "ui/aura/window.h" | 24 #include "ui/aura/window.h" |
| 25 #include "ui/aura/window_tree_host.h" | 25 #include "ui/aura/window_tree_host.h" |
| 26 #include "ui/views/mus/aura_init.h" | 26 #include "ui/views/mus/aura_init.h" |
| 27 #include "ui/views/mus/clipboard_mus.h" | 27 #include "ui/views/mus/clipboard_mus.h" |
| 28 #include "ui/views/mus/desktop_window_tree_host_mus.h" | 28 #include "ui/views/mus/desktop_window_tree_host_mus.h" |
| 29 #include "ui/views/mus/mus_property_mirror.h" |
| 29 #include "ui/views/mus/pointer_watcher_event_router.h" | 30 #include "ui/views/mus/pointer_watcher_event_router.h" |
| 30 #include "ui/views/mus/screen_mus.h" | 31 #include "ui/views/mus/screen_mus.h" |
| 31 #include "ui/views/views_delegate.h" | 32 #include "ui/views/views_delegate.h" |
| 32 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" | 33 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" |
| 33 #include "ui/views/widget/widget_delegate.h" | 34 #include "ui/views/widget/widget_delegate.h" |
| 34 #include "ui/wm/core/capture_controller.h" | 35 #include "ui/wm/core/capture_controller.h" |
| 35 #include "ui/wm/core/wm_state.h" | 36 #include "ui/wm/core/wm_state.h" |
| 36 | 37 |
| 37 // Widget::InitParams::Type must match that of ui::mojom::WindowType. | 38 // Widget::InitParams::Type must match that of ui::mojom::WindowType. |
| 38 #define WINDOW_TYPES_MATCH(NAME) \ | 39 #define WINDOW_TYPES_MATCH(NAME) \ |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 return native_widget; | 222 return native_widget; |
| 222 } | 223 } |
| 223 | 224 |
| 224 void MusClient::AddObserver(MusClientObserver* observer) { | 225 void MusClient::AddObserver(MusClientObserver* observer) { |
| 225 observer_list_.AddObserver(observer); | 226 observer_list_.AddObserver(observer); |
| 226 } | 227 } |
| 227 | 228 |
| 228 void MusClient::RemoveObserver(MusClientObserver* observer) { | 229 void MusClient::RemoveObserver(MusClientObserver* observer) { |
| 229 observer_list_.RemoveObserver(observer); | 230 observer_list_.RemoveObserver(observer); |
| 230 } | 231 } |
| 232 void MusClient::SetMusPropertyMirror( |
| 233 std::unique_ptr<MusPropertyMirror> mirror) { |
| 234 mus_property_mirror_ = std::move(mirror); |
| 235 } |
| 231 | 236 |
| 232 void MusClient::OnEmbed( | 237 void MusClient::OnEmbed( |
| 233 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) { | 238 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) { |
| 234 NOTREACHED(); | 239 NOTREACHED(); |
| 235 } | 240 } |
| 236 | 241 |
| 237 void MusClient::OnLostConnection(aura::WindowTreeClient* client) {} | 242 void MusClient::OnLostConnection(aura::WindowTreeClient* client) {} |
| 238 | 243 |
| 239 void MusClient::OnEmbedRootDestroyed( | 244 void MusClient::OnEmbedRootDestroyed( |
| 240 aura::WindowTreeHostMus* window_tree_host) { | 245 aura::WindowTreeHostMus* window_tree_host) { |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 return root->GetTopWindowContainingPoint(relative_point); | 277 return root->GetTopWindowContainingPoint(relative_point); |
| 273 } | 278 } |
| 274 return nullptr; | 279 return nullptr; |
| 275 } | 280 } |
| 276 | 281 |
| 277 std::unique_ptr<OSExchangeData::Provider> MusClient::BuildProvider() { | 282 std::unique_ptr<OSExchangeData::Provider> MusClient::BuildProvider() { |
| 278 return base::MakeUnique<aura::OSExchangeDataProviderMus>(); | 283 return base::MakeUnique<aura::OSExchangeDataProviderMus>(); |
| 279 } | 284 } |
| 280 | 285 |
| 281 } // namespace views | 286 } // namespace views |
| OLD | NEW |