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

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

Issue 2850743004: Replace ServiceInfo with BindSourceInfo. (Closed)
Patch Set: . Created 3 years, 7 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/renderer/render_frame_impl.h ('k') | mash/browser/browser.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 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 1300 matching lines...) Expand 10 before | Expand all | Expand 10 after
1311 void RenderFrameImpl::InitializeBlameContext(RenderFrameImpl* parent_frame) { 1311 void RenderFrameImpl::InitializeBlameContext(RenderFrameImpl* parent_frame) {
1312 DCHECK(!blame_context_); 1312 DCHECK(!blame_context_);
1313 blame_context_ = base::MakeUnique<FrameBlameContext>(this, parent_frame); 1313 blame_context_ = base::MakeUnique<FrameBlameContext>(this, parent_frame);
1314 blame_context_->Initialize(); 1314 blame_context_->Initialize();
1315 } 1315 }
1316 1316
1317 void RenderFrameImpl::GetInterface( 1317 void RenderFrameImpl::GetInterface(
1318 const std::string& interface_name, 1318 const std::string& interface_name,
1319 mojo::ScopedMessagePipeHandle interface_pipe) { 1319 mojo::ScopedMessagePipeHandle interface_pipe) {
1320 // TODO(beng): We should be getting this info from the frame factory request. 1320 // TODO(beng): We should be getting this info from the frame factory request.
1321 service_manager::ServiceInfo browser_info = 1321 service_manager::BindSourceInfo browser_info =
1322 ChildThreadImpl::current()->GetBrowserServiceInfo(); 1322 ChildThreadImpl::current()->GetBrowserServiceInfo();
1323 interface_registry_->BindInterface(browser_info.identity, interface_name, 1323 interface_registry_->BindInterface(browser_info.identity, interface_name,
1324 std::move(interface_pipe)); 1324 std::move(interface_pipe));
1325 } 1325 }
1326 1326
1327 RenderWidget* RenderFrameImpl::GetRenderWidget() { 1327 RenderWidget* RenderFrameImpl::GetRenderWidget() {
1328 return GetLocalRoot()->render_widget_.get(); 1328 return GetLocalRoot()->render_widget_.get();
1329 } 1329 }
1330 1330
1331 #if BUILDFLAG(ENABLE_PLUGINS) 1331 #if BUILDFLAG(ENABLE_PLUGINS)
(...skipping 1401 matching lines...) Expand 10 before | Expand all | Expand 10 after
2733 } 2733 }
2734 2734
2735 engagement_level_ = std::make_pair(origin, level); 2735 engagement_level_ = std::make_pair(origin, level);
2736 } 2736 }
2737 2737
2738 // mojom::Frame implementation ------------------------------------------------- 2738 // mojom::Frame implementation -------------------------------------------------
2739 2739
2740 void RenderFrameImpl::GetInterfaceProvider( 2740 void RenderFrameImpl::GetInterfaceProvider(
2741 service_manager::mojom::InterfaceProviderRequest request) { 2741 service_manager::mojom::InterfaceProviderRequest request) {
2742 // TODO(beng): We should be getting this info from the frame factory request. 2742 // TODO(beng): We should be getting this info from the frame factory request.
2743 service_manager::ServiceInfo browser_info = 2743 service_manager::BindSourceInfo browser_info =
2744 ChildThreadImpl::current()->GetBrowserServiceInfo(); 2744 ChildThreadImpl::current()->GetBrowserServiceInfo();
2745 service_manager::Connector* connector = ChildThread::Get()->GetConnector(); 2745 service_manager::Connector* connector = ChildThread::Get()->GetConnector();
2746 connector->FilterInterfaces( 2746 connector->FilterInterfaces(
2747 mojom::kNavigation_FrameSpec, browser_info.identity, std::move(request), 2747 mojom::kNavigation_FrameSpec, browser_info.identity, std::move(request),
2748 interface_provider_bindings_.CreateInterfacePtrAndBind(this)); 2748 interface_provider_bindings_.CreateInterfacePtrAndBind(this));
2749 } 2749 }
2750 2750
2751 void RenderFrameImpl::AllowBindings(int32_t enabled_bindings_flags) { 2751 void RenderFrameImpl::AllowBindings(int32_t enabled_bindings_flags) {
2752 if (IsMainFrame() && (enabled_bindings_flags & BINDINGS_POLICY_WEB_UI) && 2752 if (IsMainFrame() && (enabled_bindings_flags & BINDINGS_POLICY_WEB_UI) &&
2753 !(enabled_bindings_ & BINDINGS_POLICY_WEB_UI)) { 2753 !(enabled_bindings_ & BINDINGS_POLICY_WEB_UI)) {
(...skipping 4286 matching lines...) Expand 10 before | Expand all | Expand 10 after
7040 policy(info.default_policy), 7040 policy(info.default_policy),
7041 replaces_current_history_item(info.replaces_current_history_item), 7041 replaces_current_history_item(info.replaces_current_history_item),
7042 history_navigation_in_new_child_frame( 7042 history_navigation_in_new_child_frame(
7043 info.is_history_navigation_in_new_child_frame), 7043 info.is_history_navigation_in_new_child_frame),
7044 client_redirect(info.is_client_redirect), 7044 client_redirect(info.is_client_redirect),
7045 cache_disabled(info.is_cache_disabled), 7045 cache_disabled(info.is_cache_disabled),
7046 form(info.form), 7046 form(info.form),
7047 source_location(info.source_location) {} 7047 source_location(info.source_location) {}
7048 7048
7049 } // namespace content 7049 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | mash/browser/browser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698