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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 1734643003: Remove CapabilityFilter from Connect() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@13connector2
Patch Set: . Created 4 years, 9 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 | « content/browser/mojo/mojo_shell_context.cc ('k') | content/test/data/web_ui_mojo_shell_test.js » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 6056 matching lines...) Expand 10 before | Expand all | Expand 10 after
6067 template <typename Interface> 6067 template <typename Interface>
6068 void RenderFrameImpl::GetInterface(mojo::InterfaceRequest<Interface> request) { 6068 void RenderFrameImpl::GetInterface(mojo::InterfaceRequest<Interface> request) {
6069 GetServiceRegistry()->ConnectToRemoteService(std::move(request)); 6069 GetServiceRegistry()->ConnectToRemoteService(std::move(request));
6070 } 6070 }
6071 6071
6072 mojo::shell::mojom::InterfaceProviderPtr RenderFrameImpl::ConnectToApplication( 6072 mojo::shell::mojom::InterfaceProviderPtr RenderFrameImpl::ConnectToApplication(
6073 const GURL& url) { 6073 const GURL& url) {
6074 if (!mojo_shell_) 6074 if (!mojo_shell_)
6075 GetServiceRegistry()->ConnectToRemoteService(mojo::GetProxy(&mojo_shell_)); 6075 GetServiceRegistry()->ConnectToRemoteService(mojo::GetProxy(&mojo_shell_));
6076 mojo::shell::mojom::InterfaceProviderPtr interface_provider; 6076 mojo::shell::mojom::InterfaceProviderPtr interface_provider;
6077 mojo::shell::mojom::CapabilityFilterPtr filter(
6078 mojo::shell::mojom::CapabilityFilter::New());
6079 mojo::Array<mojo::String> all_interfaces;
6080 all_interfaces.push_back("*");
6081 filter->filter.insert("*", std::move(all_interfaces));
6082 mojo::shell::mojom::ConnectorPtr connector; 6077 mojo::shell::mojom::ConnectorPtr connector;
6083 mojo_shell_->GetConnector(GetProxy(&connector)); 6078 mojo_shell_->GetConnector(GetProxy(&connector));
6084 connector->Connect( 6079 connector->Connect(
6085 url.spec(), mojo::shell::mojom::Connector::kUserInherit, 6080 url.spec(), mojo::shell::mojom::Connector::kUserInherit,
6086 GetProxy(&interface_provider), nullptr, std::move(filter), 6081 GetProxy(&interface_provider), nullptr, base::Bind(&OnGotInstanceID));
6087 base::Bind(&OnGotInstanceID));
6088 return interface_provider; 6082 return interface_provider;
6089 } 6083 }
6090 6084
6091 media::RendererWebMediaPlayerDelegate* 6085 media::RendererWebMediaPlayerDelegate*
6092 RenderFrameImpl::GetWebMediaPlayerDelegate() { 6086 RenderFrameImpl::GetWebMediaPlayerDelegate() {
6093 if (!media_player_delegate_) 6087 if (!media_player_delegate_)
6094 media_player_delegate_ = new media::RendererWebMediaPlayerDelegate(this); 6088 media_player_delegate_ = new media::RendererWebMediaPlayerDelegate(this);
6095 return media_player_delegate_; 6089 return media_player_delegate_;
6096 } 6090 }
6097 6091
(...skipping 26 matching lines...) Expand all
6124 int match_count, 6118 int match_count,
6125 int ordinal, 6119 int ordinal,
6126 const WebRect& selection_rect, 6120 const WebRect& selection_rect,
6127 bool final_status_update) { 6121 bool final_status_update) {
6128 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, 6122 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
6129 selection_rect, ordinal, 6123 selection_rect, ordinal,
6130 final_status_update)); 6124 final_status_update));
6131 } 6125 }
6132 6126
6133 } // namespace content 6127 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/mojo/mojo_shell_context.cc ('k') | content/test/data/web_ui_mojo_shell_test.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698