OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "components/web_view/frame_connection.h" | 5 #include "components/web_view/frame_connection.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
11 #include "build/build_config.h" | 11 #include "build/build_config.h" |
12 #include "components/clipboard/public/interfaces/clipboard.mojom.h" | 12 #include "components/clipboard/public/interfaces/clipboard.mojom.h" |
| 13 #include "components/mus/public/interfaces/display.mojom.h" |
13 #include "components/mus/public/interfaces/gpu.mojom.h" | 14 #include "components/mus/public/interfaces/gpu.mojom.h" |
14 #include "components/mus/public/interfaces/window_tree_host.mojom.h" | 15 #include "components/mus/public/interfaces/window_tree_host.mojom.h" |
15 #include "components/resource_provider/public/interfaces/resource_provider.mojom
.h" | 16 #include "components/resource_provider/public/interfaces/resource_provider.mojom
.h" |
16 #include "components/web_view/frame_tree.h" | 17 #include "components/web_view/frame_tree.h" |
17 #include "components/web_view/frame_utils.h" | 18 #include "components/web_view/frame_utils.h" |
18 #include "components/web_view/test_runner/public/interfaces/layout_test_runner.m
ojom.h" | 19 #include "components/web_view/test_runner/public/interfaces/layout_test_runner.m
ojom.h" |
19 #include "mojo/services/network/public/interfaces/cookie_store.mojom.h" | 20 #include "mojo/services/network/public/interfaces/cookie_store.mojom.h" |
20 #include "mojo/services/network/public/interfaces/network_service.mojom.h" | 21 #include "mojo/services/network/public/interfaces/network_service.mojom.h" |
21 #include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h" | 22 #include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h" |
22 #include "mojo/services/network/public/interfaces/web_socket_factory.mojom.h" | 23 #include "mojo/services/network/public/interfaces/web_socket_factory.mojom.h" |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 filter->filter.insert("mojo:clipboard", std::move(clipboard_interfaces)); | 94 filter->filter.insert("mojo:clipboard", std::move(clipboard_interfaces)); |
94 | 95 |
95 mojo::Array<mojo::String> tracing_interfaces; | 96 mojo::Array<mojo::String> tracing_interfaces; |
96 tracing_interfaces.push_back(tracing::StartupPerformanceDataCollector::Name_); | 97 tracing_interfaces.push_back(tracing::StartupPerformanceDataCollector::Name_); |
97 tracing_interfaces.push_back(tracing::TraceCollector::Name_); | 98 tracing_interfaces.push_back(tracing::TraceCollector::Name_); |
98 filter->filter.insert("mojo:tracing", std::move(tracing_interfaces)); | 99 filter->filter.insert("mojo:tracing", std::move(tracing_interfaces)); |
99 | 100 |
100 mojo::Array<mojo::String> window_manager_interfaces; | 101 mojo::Array<mojo::String> window_manager_interfaces; |
101 window_manager_interfaces.push_back(mus::mojom::Gpu::Name_); | 102 window_manager_interfaces.push_back(mus::mojom::Gpu::Name_); |
102 window_manager_interfaces.push_back(mus::mojom::WindowTreeHostFactory::Name_); | 103 window_manager_interfaces.push_back(mus::mojom::WindowTreeHostFactory::Name_); |
| 104 window_manager_interfaces.push_back(mus::mojom::DisplayManager::Name_); |
103 filter->filter.insert("mojo:mus", std::move(window_manager_interfaces)); | 105 filter->filter.insert("mojo:mus", std::move(window_manager_interfaces)); |
104 | 106 |
105 mojo::Array<mojo::String> test_runner_interfaces; | 107 mojo::Array<mojo::String> test_runner_interfaces; |
106 test_runner_interfaces.push_back(LayoutTestRunner::Name_); | 108 test_runner_interfaces.push_back(LayoutTestRunner::Name_); |
107 filter->filter.insert("mojo:web_view_test_runner", | 109 filter->filter.insert("mojo:web_view_test_runner", |
108 std::move(test_runner_interfaces)); | 110 std::move(test_runner_interfaces)); |
109 | 111 |
110 #if defined(OS_LINUX) && !defined(OS_ANDROID) | 112 #if defined(OS_LINUX) && !defined(OS_ANDROID) |
111 mojo::Array<mojo::String> font_service_interfaces; | 113 mojo::Array<mojo::String> font_service_interfaces; |
112 font_service_interfaces.push_back(font_service::FontService::Name_); | 114 font_service_interfaces.push_back(font_service::FontService::Name_); |
(...skipping 16 matching lines...) Expand all Loading... |
129 } | 131 } |
130 | 132 |
131 uint32_t FrameConnection::GetContentHandlerID() const { | 133 uint32_t FrameConnection::GetContentHandlerID() const { |
132 uint32_t content_handler_id = mojo::Shell::kInvalidContentHandlerID; | 134 uint32_t content_handler_id = mojo::Shell::kInvalidContentHandlerID; |
133 if (!application_connection_->GetContentHandlerID(&content_handler_id)) | 135 if (!application_connection_->GetContentHandlerID(&content_handler_id)) |
134 NOTREACHED(); | 136 NOTREACHED(); |
135 return content_handler_id; | 137 return content_handler_id; |
136 } | 138 } |
137 | 139 |
138 } // namespace web_view | 140 } // namespace web_view |
OLD | NEW |