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