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

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

Issue 1679573002: Move shell interfaces into the shell.mojom namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@delegate
Patch Set: . Created 4 years, 10 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
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 6039 matching lines...) Expand 10 before | Expand all | Expand 10 after
6050 GetServiceRegistry()->ConnectToRemoteService(std::move(request)); 6050 GetServiceRegistry()->ConnectToRemoteService(std::move(request));
6051 } 6051 }
6052 6052
6053 mojo::ServiceProviderPtr RenderFrameImpl::ConnectToApplication( 6053 mojo::ServiceProviderPtr RenderFrameImpl::ConnectToApplication(
6054 const GURL& url) { 6054 const GURL& url) {
6055 if (!mojo_shell_) 6055 if (!mojo_shell_)
6056 GetServiceRegistry()->ConnectToRemoteService(mojo::GetProxy(&mojo_shell_)); 6056 GetServiceRegistry()->ConnectToRemoteService(mojo::GetProxy(&mojo_shell_));
6057 mojo::ServiceProviderPtr service_provider; 6057 mojo::ServiceProviderPtr service_provider;
6058 mojo::URLRequestPtr request(mojo::URLRequest::New()); 6058 mojo::URLRequestPtr request(mojo::URLRequest::New());
6059 request->url = mojo::String::From(url); 6059 request->url = mojo::String::From(url);
6060 mojo::CapabilityFilterPtr filter(mojo::CapabilityFilter::New()); 6060 mojo::shell::mojom::CapabilityFilterPtr filter(
6061 mojo::shell::mojom::CapabilityFilter::New());
6061 mojo::Array<mojo::String> all_interfaces; 6062 mojo::Array<mojo::String> all_interfaces;
6062 all_interfaces.push_back("*"); 6063 all_interfaces.push_back("*");
6063 filter->filter.insert("*", std::move(all_interfaces)); 6064 filter->filter.insert("*", std::move(all_interfaces));
6064 mojo_shell_->ConnectToApplication( 6065 mojo_shell_->ConnectToApplication(
6065 std::move(request), GetProxy(&service_provider), nullptr, 6066 std::move(request), GetProxy(&service_provider), nullptr,
6066 std::move(filter), base::Bind(&OnGotRemoteIDs)); 6067 std::move(filter), base::Bind(&OnGotRemoteIDs));
6067 return service_provider; 6068 return service_provider;
6068 } 6069 }
6069 6070
6070 media::RendererWebMediaPlayerDelegate* 6071 media::RendererWebMediaPlayerDelegate*
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
6107 int match_count, 6108 int match_count,
6108 int ordinal, 6109 int ordinal,
6109 const WebRect& selection_rect, 6110 const WebRect& selection_rect,
6110 bool final_status_update) { 6111 bool final_status_update) {
6111 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, 6112 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
6112 selection_rect, ordinal, 6113 selection_rect, ordinal,
6113 final_status_update)); 6114 final_status_update));
6114 } 6115 }
6115 6116
6116 } // namespace content 6117 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | mandoline/services/core_services/core_services_application_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698