Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(845)

Side by Side Diff: components/web_view/frame_connection.cc

Issue 1414663002: Mandoline webview: View => Window (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More renaming Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « components/web_view/frame_apptest.cc ('k') | components/web_view/frame_tree.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 filter->filter.insert("mojo:tracing", tracing_interfaces.Pass()); 94 filter->filter.insert("mojo:tracing", tracing_interfaces.Pass());
95 95
96 mojo::Array<mojo::String> view_manager_interfaces; 96 mojo::Array<mojo::String> window_manager_interfaces;
97 view_manager_interfaces.push_back(mus::mojom::Gpu::Name_); 97 window_manager_interfaces.push_back(mus::mojom::Gpu::Name_);
98 view_manager_interfaces.push_back(mus::mojom::WindowTreeHostFactory::Name_); 98 window_manager_interfaces.push_back(mus::mojom::WindowTreeHostFactory::Name_);
99 filter->filter.insert("mojo:mus", view_manager_interfaces.Pass()); 99 filter->filter.insert("mojo:mus", window_manager_interfaces.Pass());
100 100
101 mojo::Array<mojo::String> test_runner_interfaces; 101 mojo::Array<mojo::String> test_runner_interfaces;
102 test_runner_interfaces.push_back(LayoutTestRunner::Name_); 102 test_runner_interfaces.push_back(LayoutTestRunner::Name_);
103 filter->filter.insert("mojo:web_view_test_runner", 103 filter->filter.insert("mojo:web_view_test_runner",
104 test_runner_interfaces.Pass()); 104 test_runner_interfaces.Pass());
105 105
106 #if defined(OS_LINUX) && !defined(OS_ANDROID) 106 #if defined(OS_LINUX) && !defined(OS_ANDROID)
107 mojo::Array<mojo::String> font_service_interfaces; 107 mojo::Array<mojo::String> font_service_interfaces;
108 font_service_interfaces.push_back(font_service::FontService::Name_); 108 font_service_interfaces.push_back(font_service::FontService::Name_);
109 filter->filter.insert("mojo:font_service", font_service_interfaces.Pass()); 109 filter->filter.insert("mojo:font_service", font_service_interfaces.Pass());
(...skipping 13 matching lines...) Expand all
123 } 123 }
124 124
125 uint32_t FrameConnection::GetContentHandlerID() const { 125 uint32_t FrameConnection::GetContentHandlerID() const {
126 uint32_t content_handler_id = mojo::Shell::kInvalidContentHandlerID; 126 uint32_t content_handler_id = mojo::Shell::kInvalidContentHandlerID;
127 if (!application_connection_->GetContentHandlerID(&content_handler_id)) 127 if (!application_connection_->GetContentHandlerID(&content_handler_id))
128 NOTREACHED(); 128 NOTREACHED();
129 return content_handler_id; 129 return content_handler_id;
130 } 130 }
131 131
132 } // namespace web_view 132 } // namespace web_view
OLDNEW
« no previous file with comments | « components/web_view/frame_apptest.cc ('k') | components/web_view/frame_tree.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698