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

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

Issue 1769163002: Add a instance groups to Connect(), and introduce an Identity struct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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/public/test/test_mojo_app.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 6070 matching lines...) Expand 10 before | Expand all | Expand 10 after
6081 template <typename Interface> 6081 template <typename Interface>
6082 void RenderFrameImpl::GetInterface(mojo::InterfaceRequest<Interface> request) { 6082 void RenderFrameImpl::GetInterface(mojo::InterfaceRequest<Interface> request) {
6083 GetServiceRegistry()->ConnectToRemoteService(std::move(request)); 6083 GetServiceRegistry()->ConnectToRemoteService(std::move(request));
6084 } 6084 }
6085 6085
6086 mojo::shell::mojom::InterfaceProviderPtr RenderFrameImpl::ConnectToApplication( 6086 mojo::shell::mojom::InterfaceProviderPtr RenderFrameImpl::ConnectToApplication(
6087 const GURL& url) { 6087 const GURL& url) {
6088 if (!connector_) 6088 if (!connector_)
6089 GetServiceRegistry()->ConnectToRemoteService(mojo::GetProxy(&connector_)); 6089 GetServiceRegistry()->ConnectToRemoteService(mojo::GetProxy(&connector_));
6090 mojo::shell::mojom::InterfaceProviderPtr interface_provider; 6090 mojo::shell::mojom::InterfaceProviderPtr interface_provider;
6091 connector_->Connect(url.spec(), mojo::shell::mojom::kInheritUserID, 6091 mojo::shell::mojom::IdentityPtr target(mojo::shell::mojom::Identity::New());
6092 GetProxy(&interface_provider), nullptr, 6092 target->name = url.spec();
6093 target->user_id = mojo::shell::mojom::kInheritUserID;
6094 target->instance = "";
6095 connector_->Connect(std::move(target), GetProxy(&interface_provider), nullptr,
6093 base::Bind(&OnGotInstanceID)); 6096 base::Bind(&OnGotInstanceID));
6094 return interface_provider; 6097 return interface_provider;
6095 } 6098 }
6096 6099
6097 media::RendererWebMediaPlayerDelegate* 6100 media::RendererWebMediaPlayerDelegate*
6098 RenderFrameImpl::GetWebMediaPlayerDelegate() { 6101 RenderFrameImpl::GetWebMediaPlayerDelegate() {
6099 if (!media_player_delegate_) 6102 if (!media_player_delegate_)
6100 media_player_delegate_ = new media::RendererWebMediaPlayerDelegate(this); 6103 media_player_delegate_ = new media::RendererWebMediaPlayerDelegate(this);
6101 return media_player_delegate_; 6104 return media_player_delegate_;
6102 } 6105 }
(...skipping 27 matching lines...) Expand all
6130 int match_count, 6133 int match_count,
6131 int ordinal, 6134 int ordinal,
6132 const WebRect& selection_rect, 6135 const WebRect& selection_rect,
6133 bool final_status_update) { 6136 bool final_status_update) {
6134 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, 6137 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
6135 selection_rect, ordinal, 6138 selection_rect, ordinal,
6136 final_status_update)); 6139 final_status_update));
6137 } 6140 }
6138 6141
6139 } // namespace content 6142 } // namespace content
OLDNEW
« no previous file with comments | « content/public/test/test_mojo_app.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