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 "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/callback.h" | 8 #include "base/callback.h" |
9 #include "components/clipboard/public/interfaces/clipboard.mojom.h" | 9 #include "components/clipboard/public/interfaces/clipboard.mojom.h" |
10 #include "components/mus/public/interfaces/gpu.mojom.h" | 10 #include "components/mus/public/interfaces/gpu.mojom.h" |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 network_service_interfaces.push_back(mojo::WebSocketFactory::Name_); | 84 network_service_interfaces.push_back(mojo::WebSocketFactory::Name_); |
85 filter->filter.insert("mojo:network_service", | 85 filter->filter.insert("mojo:network_service", |
86 network_service_interfaces.Pass()); | 86 network_service_interfaces.Pass()); |
87 | 87 |
88 mojo::Array<mojo::String> clipboard_interfaces; | 88 mojo::Array<mojo::String> clipboard_interfaces; |
89 clipboard_interfaces.push_back(mojo::Clipboard::Name_); | 89 clipboard_interfaces.push_back(mojo::Clipboard::Name_); |
90 filter->filter.insert("mojo:clipboard", clipboard_interfaces.Pass()); | 90 filter->filter.insert("mojo:clipboard", clipboard_interfaces.Pass()); |
91 | 91 |
92 mojo::Array<mojo::String> tracing_interfaces; | 92 mojo::Array<mojo::String> tracing_interfaces; |
93 tracing_interfaces.push_back(tracing::StartupPerformanceDataCollector::Name_); | 93 tracing_interfaces.push_back(tracing::StartupPerformanceDataCollector::Name_); |
| 94 tracing_interfaces.push_back(tracing::TraceCollector::Name_); |
94 filter->filter.insert("mojo:tracing", tracing_interfaces.Pass()); | 95 filter->filter.insert("mojo:tracing", tracing_interfaces.Pass()); |
95 | 96 |
96 mojo::Array<mojo::String> window_manager_interfaces; | 97 mojo::Array<mojo::String> window_manager_interfaces; |
97 window_manager_interfaces.push_back(mus::mojom::Gpu::Name_); | 98 window_manager_interfaces.push_back(mus::mojom::Gpu::Name_); |
98 window_manager_interfaces.push_back(mus::mojom::WindowTreeHostFactory::Name_); | 99 window_manager_interfaces.push_back(mus::mojom::WindowTreeHostFactory::Name_); |
99 filter->filter.insert("mojo:mus", window_manager_interfaces.Pass()); | 100 filter->filter.insert("mojo:mus", window_manager_interfaces.Pass()); |
100 | 101 |
101 mojo::Array<mojo::String> test_runner_interfaces; | 102 mojo::Array<mojo::String> test_runner_interfaces; |
102 test_runner_interfaces.push_back(LayoutTestRunner::Name_); | 103 test_runner_interfaces.push_back(LayoutTestRunner::Name_); |
103 filter->filter.insert("mojo:web_view_test_runner", | 104 filter->filter.insert("mojo:web_view_test_runner", |
(...skipping 19 matching lines...) Expand all Loading... |
123 } | 124 } |
124 | 125 |
125 uint32_t FrameConnection::GetContentHandlerID() const { | 126 uint32_t FrameConnection::GetContentHandlerID() const { |
126 uint32_t content_handler_id = mojo::Shell::kInvalidContentHandlerID; | 127 uint32_t content_handler_id = mojo::Shell::kInvalidContentHandlerID; |
127 if (!application_connection_->GetContentHandlerID(&content_handler_id)) | 128 if (!application_connection_->GetContentHandlerID(&content_handler_id)) |
128 NOTREACHED(); | 129 NOTREACHED(); |
129 return content_handler_id; | 130 return content_handler_id; |
130 } | 131 } |
131 | 132 |
132 } // namespace web_view | 133 } // namespace web_view |
OLD | NEW |