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

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

Issue 2420253002: Rename shell namespace to service_manager (Closed)
Patch Set: . Created 4 years, 2 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/web_contents/web_contents_impl.h ('k') | content/child/child_thread_impl.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 (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 4905 matching lines...) Expand 10 before | Expand all | Expand 10 after
4916 void WebContentsImpl::RequestFindMatchRects(int current_version) { 4916 void WebContentsImpl::RequestFindMatchRects(int current_version) {
4917 GetOrCreateFindRequestManager()->RequestFindMatchRects(current_version); 4917 GetOrCreateFindRequestManager()->RequestFindMatchRects(current_version);
4918 } 4918 }
4919 4919
4920 bool WebContentsImpl::CreateRenderViewForInitialEmptyDocument() { 4920 bool WebContentsImpl::CreateRenderViewForInitialEmptyDocument() {
4921 return CreateRenderViewForRenderManager( 4921 return CreateRenderViewForRenderManager(
4922 GetRenderViewHost(), MSG_ROUTING_NONE, MSG_ROUTING_NONE, 4922 GetRenderViewHost(), MSG_ROUTING_NONE, MSG_ROUTING_NONE,
4923 frame_tree_.root()->current_replication_state()); 4923 frame_tree_.root()->current_replication_state());
4924 } 4924 }
4925 4925
4926 shell::InterfaceProvider* WebContentsImpl::GetJavaInterfaces() { 4926 service_manager::InterfaceProvider* WebContentsImpl::GetJavaInterfaces() {
4927 if (!java_interfaces_) { 4927 if (!java_interfaces_) {
4928 shell::mojom::InterfaceProviderPtr provider; 4928 service_manager::mojom::InterfaceProviderPtr provider;
4929 BindInterfaceRegistryForWebContents(mojo::GetProxy(&provider), this); 4929 BindInterfaceRegistryForWebContents(mojo::GetProxy(&provider), this);
4930 java_interfaces_.reset(new shell::InterfaceProvider); 4930 java_interfaces_.reset(new service_manager::InterfaceProvider);
4931 java_interfaces_->Bind(std::move(provider)); 4931 java_interfaces_->Bind(std::move(provider));
4932 } 4932 }
4933 return java_interfaces_.get(); 4933 return java_interfaces_.get();
4934 } 4934 }
4935 4935
4936 #elif defined(OS_MACOSX) 4936 #elif defined(OS_MACOSX)
4937 4937
4938 void WebContentsImpl::SetAllowOtherViews(bool allow) { 4938 void WebContentsImpl::SetAllowOtherViews(bool allow) {
4939 view_->SetAllowOtherViews(allow); 4939 view_->SetAllowOtherViews(allow);
4940 } 4940 }
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
5187 dialog_manager_ = dialog_manager; 5187 dialog_manager_ = dialog_manager;
5188 } 5188 }
5189 5189
5190 void WebContentsImpl::RemoveBindingSet(const std::string& interface_name) { 5190 void WebContentsImpl::RemoveBindingSet(const std::string& interface_name) {
5191 auto it = binding_sets_.find(interface_name); 5191 auto it = binding_sets_.find(interface_name);
5192 if (it != binding_sets_.end()) 5192 if (it != binding_sets_.end())
5193 binding_sets_.erase(it); 5193 binding_sets_.erase(it);
5194 } 5194 }
5195 5195
5196 } // namespace content 5196 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/child/child_thread_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698