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

Unified Diff: content/browser/browser_main_loop.cc

Issue 2643713002: Port BatteryMonitor into Device Service (Closed)
Patch Set: Rebase Created 3 years, 11 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 d6d917b4c3f3ac7a90f23333b621bec4cf94a67f..c7d97015d391925bdc9e0a95470ce2cb6269fedd 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -90,7 +90,6 @@
#include "content/public/common/content_switches.h"
#include "content/public/common/main_function_params.h"
#include "content/public/common/result_codes.h"
-#include "device/battery/battery_status_service.h"
#include "device/gamepad/gamepad_service.h"
#include "media/base/media.h"
#include "media/base/user_input_monitor.h"
@@ -1366,12 +1365,6 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() {
TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:SensorService");
DeviceSensorService::GetInstance()->Shutdown();
}
-#if !defined(OS_ANDROID)
- {
- TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:BatteryStatusService");
- device::BatteryStatusService::GetInstance()->Shutdown();
- }
-#endif
{
TRACE_EVENT0("shutdown", "BrowserMainLoop::Subsystem:DeleteDataSources");
URLDataManager::DeleteDataSources();

Powered by Google App Engine
This is Rietveld 408576698