content/browser/browser_main_loop.cc - Issue 592153002: Replace Chrome IPC with Mojo IPC for querying BatteryStatus service

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/browser_main_loop.cc

Issue 592153002: Replace Chrome IPC with Mojo IPC for querying BatteryStatus service (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address Tim's comments. Created 6 years, 3 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/battery_status/battery_status_service_unittest.cc ('k') | content/browser/frame_host/render_frame_host_impl.cc » ('j') | content/browser/renderer_host/render_process_host_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/browser_main_loop.cc

diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc

index d9bfded9f2230b6c0c0b124edf5bf0d3089fde8d..eb4e05d60cd6b7f7e79abf8a91bd7c27e22bf917 100644

--- a/content/browser/browser_main_loop.cc

+++ b/content/browser/browser_main_loop.cc

@@ -22,7 +22,6 @@

#include "base/thread_task_runner_handle.h"

#include "base/threading/thread_restrictions.h"

#include "base/timer/hi_res_timer_manager.h"

-#include "content/browser/battery_status/battery_status_service.h"

#include "content/browser/browser_thread_impl.h"

#include "content/browser/device_sensors/device_inertial_sensor_service.h"

#include "content/browser/download/save_file_manager.h"

@@ -51,6 +50,7 @@

#include "content/public/common/main_function_params.h"

#include "content/public/common/result_codes.h"

#include "crypto/nss_util.h"

+#include "device/battery/battery_status_service.h"

#include "media/audio/audio_manager.h"

#include "media/base/media.h"

#include "media/base/user_input_monitor.h"

@@ -930,7 +930,7 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() {

}

{

TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:BatteryStatusService");

- BatteryStatusService::GetInstance()->Shutdown();

+ device::BatteryStatusService::GetInstance()->Shutdown();

}

{

TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:DeleteDataSources");