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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 2947413002: Restrict CM API interface request and message dispatch. (Closed)
Patch Set: Addressed comments, and used an associated interface. Created 3 years, 5 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <cmath> 9 #include <cmath>
10 #include <utility> 10 #include <utility>
(...skipping 4353 matching lines...) Expand 10 before | Expand all | Expand 10 after
4364 const LoadCommittedDetails& load_details) { 4364 const LoadCommittedDetails& load_details) {
4365 for (auto& observer : observers_) 4365 for (auto& observer : observers_)
4366 observer.NavigationEntryCommitted(load_details); 4366 observer.NavigationEntryCommitted(load_details);
4367 } 4367 }
4368 4368
4369 void WebContentsImpl::OnAssociatedInterfaceRequest( 4369 void WebContentsImpl::OnAssociatedInterfaceRequest(
4370 RenderFrameHost* render_frame_host, 4370 RenderFrameHost* render_frame_host,
4371 const std::string& interface_name, 4371 const std::string& interface_name,
4372 mojo::ScopedInterfaceEndpointHandle handle) { 4372 mojo::ScopedInterfaceEndpointHandle handle) {
4373 auto it = binding_sets_.find(interface_name); 4373 auto it = binding_sets_.find(interface_name);
4374 if (it != binding_sets_.end()) 4374 if (it != binding_sets_.end()) {
4375 it->second->OnRequestForFrame(render_frame_host, std::move(handle)); 4375 it->second->OnRequestForFrame(render_frame_host, std::move(handle));
4376 return;
4377 }
4378
4379 service_manager::BindSourceInfo source_info(
4380 render_frame_host->GetProcess()->GetChildIdentity(),
4381 service_manager::CapabilitySet());
4382 GetContentClient()->browser()->BindAssociatedInterfaceRequestFromFrame(
4383 render_frame_host, source_info, interface_name, std::move(handle));
4376 } 4384 }
4377 4385
4378 const GURL& WebContentsImpl::GetMainFrameLastCommittedURL() const { 4386 const GURL& WebContentsImpl::GetMainFrameLastCommittedURL() const {
4379 return GetLastCommittedURL(); 4387 return GetLastCommittedURL();
4380 } 4388 }
4381 4389
4382 void WebContentsImpl::RenderFrameCreated(RenderFrameHost* render_frame_host) { 4390 void WebContentsImpl::RenderFrameCreated(RenderFrameHost* render_frame_host) {
4383 for (auto& observer : observers_) 4391 for (auto& observer : observers_)
4384 observer.RenderFrameCreated(render_frame_host); 4392 observer.RenderFrameCreated(render_frame_host);
4385 UpdateAccessibilityModeOnFrame(render_frame_host); 4393 UpdateAccessibilityModeOnFrame(render_frame_host);
(...skipping 1416 matching lines...) Expand 10 before | Expand all | Expand 10 after
5802 } 5810 }
5803 5811
5804 void WebContentsImpl::MediaMutedStatusChanged( 5812 void WebContentsImpl::MediaMutedStatusChanged(
5805 const WebContentsObserver::MediaPlayerId& id, 5813 const WebContentsObserver::MediaPlayerId& id,
5806 bool muted) { 5814 bool muted) {
5807 for (auto& observer : observers_) 5815 for (auto& observer : observers_)
5808 observer.MediaMutedStatusChanged(id, muted); 5816 observer.MediaMutedStatusChanged(id, muted);
5809 } 5817 }
5810 5818
5811 } // namespace content 5819 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698