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

Side by Side Diff: content/public/test/mock_render_thread.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/public/test/mock_render_thread.h ('k') | content/public/test/test_service.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/public/test/mock_render_thread.h" 5 #include "content/public/test/mock_render_thread.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/single_thread_task_runner.h" 8 #include "base/single_thread_task_runner.h"
9 #include "base/threading/thread_task_runner_handle.h" 9 #include "base/threading/thread_task_runner_handle.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 224
225 void MockRenderThread::ReleaseCachedFonts() { 225 void MockRenderThread::ReleaseCachedFonts() {
226 } 226 }
227 227
228 #endif // OS_WIN 228 #endif // OS_WIN
229 229
230 ServiceManagerConnection* MockRenderThread::GetServiceManagerConnection() { 230 ServiceManagerConnection* MockRenderThread::GetServiceManagerConnection() {
231 return nullptr; 231 return nullptr;
232 } 232 }
233 233
234 shell::InterfaceRegistry* MockRenderThread::GetInterfaceRegistry() { 234 service_manager::InterfaceRegistry* MockRenderThread::GetInterfaceRegistry() {
235 if (!interface_registry_) 235 if (!interface_registry_)
236 interface_registry_.reset(new shell::InterfaceRegistry); 236 interface_registry_.reset(new service_manager::InterfaceRegistry);
237 return interface_registry_.get(); 237 return interface_registry_.get();
238 } 238 }
239 239
240 shell::InterfaceProvider* MockRenderThread::GetRemoteInterfaces() { 240 service_manager::InterfaceProvider* MockRenderThread::GetRemoteInterfaces() {
241 if (!remote_interfaces_) { 241 if (!remote_interfaces_) {
242 shell::mojom::InterfaceProviderPtr remote_interface_provider; 242 service_manager::mojom::InterfaceProviderPtr remote_interface_provider;
243 pending_remote_interface_provider_request_ = 243 pending_remote_interface_provider_request_ =
244 GetProxy(&remote_interface_provider); 244 GetProxy(&remote_interface_provider);
245 remote_interfaces_.reset(new shell::InterfaceProvider); 245 remote_interfaces_.reset(new service_manager::InterfaceProvider);
246 remote_interfaces_->Bind(std::move(remote_interface_provider)); 246 remote_interfaces_->Bind(std::move(remote_interface_provider));
247 } 247 }
248 return remote_interfaces_.get(); 248 return remote_interfaces_.get();
249 } 249 }
250 250
251 void MockRenderThread::SendCloseMessage() { 251 void MockRenderThread::SendCloseMessage() {
252 ViewMsg_Close msg(routing_id_); 252 ViewMsg_Close msg(routing_id_);
253 RenderViewImpl::FromRoutingID(routing_id_)->OnMessageReceived(msg); 253 RenderViewImpl::FromRoutingID(routing_id_)->OnMessageReceived(msg);
254 } 254 }
255 255
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 void MockRenderThread::OnCreateWindow( 303 void MockRenderThread::OnCreateWindow(
304 const mojom::CreateNewWindowParams& params, 304 const mojom::CreateNewWindowParams& params,
305 mojom::CreateNewWindowReply* reply) { 305 mojom::CreateNewWindowReply* reply) {
306 reply->route_id = new_window_routing_id_; 306 reply->route_id = new_window_routing_id_;
307 reply->main_frame_route_id = new_window_main_frame_routing_id_; 307 reply->main_frame_route_id = new_window_main_frame_routing_id_;
308 reply->main_frame_widget_route_id = new_window_main_frame_widget_routing_id_; 308 reply->main_frame_widget_route_id = new_window_main_frame_widget_routing_id_;
309 reply->cloned_session_storage_namespace_id = 0; 309 reply->cloned_session_storage_namespace_id = 0;
310 } 310 }
311 311
312 } // namespace content 312 } // namespace content
OLDNEW
« no previous file with comments | « content/public/test/mock_render_thread.h ('k') | content/public/test/test_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698