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

Unified Diff: content/browser/browser_main_loop.cc

Issue 457933002: Replace Chrome IPC with Mojo IPC for querying BatteryStatus service Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index ac503da5e59f9eecefd856ff9441745fc93b115e..43ed3f7c94b5a23c40e18bf0fd4f85e610291c52 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"
@@ -928,7 +928,7 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() {
}
{
TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:BatteryStatusService");
- BatteryStatusService::GetInstance()->Shutdown();
+ device::BatteryStatusService::GetInstance()->Shutdown();
}
{
TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:DeleteDataSources");

Powered by Google App Engine
This is Rietveld 408576698