| 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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 clipboard_interfaces.push_back(mojo::Clipboard::Name_); | 87 clipboard_interfaces.push_back(mojo::Clipboard::Name_); |
| 88 filter->filter.insert("mojo:clipboard", clipboard_interfaces.Pass()); | 88 filter->filter.insert("mojo:clipboard", clipboard_interfaces.Pass()); |
| 89 | 89 |
| 90 mojo::Array<mojo::String> tracing_interfaces; | 90 mojo::Array<mojo::String> tracing_interfaces; |
| 91 tracing_interfaces.push_back(tracing::StartupPerformanceDataCollector::Name_); | 91 tracing_interfaces.push_back(tracing::StartupPerformanceDataCollector::Name_); |
| 92 filter->filter.insert("mojo:tracing", tracing_interfaces.Pass()); | 92 filter->filter.insert("mojo:tracing", tracing_interfaces.Pass()); |
| 93 | 93 |
| 94 mojo::Array<mojo::String> view_manager_interfaces; | 94 mojo::Array<mojo::String> view_manager_interfaces; |
| 95 view_manager_interfaces.push_back(mojo::Gpu::Name_); | 95 view_manager_interfaces.push_back(mojo::Gpu::Name_); |
| 96 view_manager_interfaces.push_back(mojo::ViewTreeHostFactory::Name_); | 96 view_manager_interfaces.push_back(mojo::ViewTreeHostFactory::Name_); |
| 97 filter->filter.insert("mojo:view_manager", view_manager_interfaces.Pass()); | 97 filter->filter.insert("mojo:mus", view_manager_interfaces.Pass()); |
| 98 | 98 |
| 99 mojo::Array<mojo::String> test_runner_interfaces; | 99 mojo::Array<mojo::String> test_runner_interfaces; |
| 100 test_runner_interfaces.push_back(LayoutTestRunner::Name_); | 100 test_runner_interfaces.push_back(LayoutTestRunner::Name_); |
| 101 filter->filter.insert("mojo:web_view_test_runner", | 101 filter->filter.insert("mojo:web_view_test_runner", |
| 102 test_runner_interfaces.Pass()); | 102 test_runner_interfaces.Pass()); |
| 103 | 103 |
| 104 #if defined(OS_LINUX) && !defined(OS_ANDROID) | 104 #if defined(OS_LINUX) && !defined(OS_ANDROID) |
| 105 mojo::Array<mojo::String> font_service_interfaces; | 105 mojo::Array<mojo::String> font_service_interfaces; |
| 106 font_service_interfaces.push_back(font_service::FontService::Name_); | 106 font_service_interfaces.push_back(font_service::FontService::Name_); |
| 107 filter->filter.insert("mojo:font_service", font_service_interfaces.Pass()); | 107 filter->filter.insert("mojo:font_service", font_service_interfaces.Pass()); |
| (...skipping 13 matching lines...) Expand all Loading... |
| 121 } | 121 } |
| 122 | 122 |
| 123 uint32_t FrameConnection::GetContentHandlerID() const { | 123 uint32_t FrameConnection::GetContentHandlerID() const { |
| 124 uint32_t content_handler_id = mojo::Shell::kInvalidContentHandlerID; | 124 uint32_t content_handler_id = mojo::Shell::kInvalidContentHandlerID; |
| 125 if (!application_connection_->GetContentHandlerID(&content_handler_id)) | 125 if (!application_connection_->GetContentHandlerID(&content_handler_id)) |
| 126 NOTREACHED(); | 126 NOTREACHED(); |
| 127 return content_handler_id; | 127 return content_handler_id; |
| 128 } | 128 } |
| 129 | 129 |
| 130 } // namespace web_view | 130 } // namespace web_view |
| OLD | NEW |