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

Side by Side Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 734123002: Mojify the battery status browsertests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address Ben's comments. Created 6 years, 1 month 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 // Represents the browser side of the browser <--> renderer communication 5 // Represents the browser side of the browser <--> renderer communication
6 // channel. There will be one RenderProcessHost per renderer process. 6 // channel. There will be one RenderProcessHost per renderer process.
7 7
8 #include "content/browser/renderer_host/render_process_host_impl.h" 8 #include "content/browser/renderer_host/render_process_host_impl.h"
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 865 matching lines...) Expand 10 before | Expand all | Expand 10 after
876 storage_partition_impl_->GetGeofencingManager())); 876 storage_partition_impl_->GetGeofencingManager()));
877 } 877 }
878 878
879 void RenderProcessHostImpl::RegisterMojoServices() { 879 void RenderProcessHostImpl::RegisterMojoServices() {
880 mojo_application_host_->service_registry()->AddService( 880 mojo_application_host_->service_registry()->AddService(
881 base::Bind(&device::BatteryMonitorImpl::Create)); 881 base::Bind(&device::BatteryMonitorImpl::Create));
882 882
883 mojo_application_host_->service_registry()->AddService( 883 mojo_application_host_->service_registry()->AddService(
884 base::Bind(&PermissionServiceContext::CreateService, 884 base::Bind(&PermissionServiceContext::CreateService,
885 base::Unretained(permission_service_context_.get()))); 885 base::Unretained(permission_service_context_.get())));
886
887 GetContentClient()->browser()->OverridePerProcessMojoServices(
888 mojo_application_host_->service_registry());
886 } 889 }
887 890
888 int RenderProcessHostImpl::GetNextRoutingID() { 891 int RenderProcessHostImpl::GetNextRoutingID() {
889 return widget_helper_->GetNextRoutingID(); 892 return widget_helper_->GetNextRoutingID();
890 } 893 }
891 894
892 void RenderProcessHostImpl::ResumeDeferredNavigation( 895 void RenderProcessHostImpl::ResumeDeferredNavigation(
893 const GlobalRequestID& request_id) { 896 const GlobalRequestID& request_id) {
894 widget_helper_->ResumeDeferredNavigation(request_id); 897 widget_helper_->ResumeDeferredNavigation(request_id);
895 } 898 }
(...skipping 1349 matching lines...) Expand 10 before | Expand all | Expand 10 after
2245 2248
2246 void RenderProcessHostImpl::DecrementWorkerRefCount() { 2249 void RenderProcessHostImpl::DecrementWorkerRefCount() {
2247 DCHECK_CURRENTLY_ON(BrowserThread::UI); 2250 DCHECK_CURRENTLY_ON(BrowserThread::UI);
2248 DCHECK_GT(worker_ref_count_, 0); 2251 DCHECK_GT(worker_ref_count_, 0);
2249 --worker_ref_count_; 2252 --worker_ref_count_;
2250 if (worker_ref_count_ == 0) 2253 if (worker_ref_count_ == 0)
2251 Cleanup(); 2254 Cleanup();
2252 } 2255 }
2253 2256
2254 } // namespace content 2257 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698