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

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 101963004: [chromeos] New PowerManagerClient observer to collect power data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | « no previous file | chromeos/chromeos.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 3bd64c83ecbbefe39fc82fdd2b3eb4964968adf4..618af72aa3837bcb4afd990e4140864dd76da6bb 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -92,6 +92,7 @@
#include "chromeos/network/network_change_notifier_chromeos.h"
#include "chromeos/network/network_change_notifier_factory_chromeos.h"
#include "chromeos/network/network_handler.h"
+#include "chromeos/power/power_data_collector.h"
#include "chromeos/system/statistics_provider.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_service.h"
@@ -260,6 +261,9 @@ class DBusServices {
DBusThreadManager::Initialize();
CrosDBusService::Initialize();
+ // Initialize PowerDataCollector after DBusThreadManager is initialized.
+ PowerDataCollector::Initialize();
+
LoginState::Initialize();
SystemSaltGetter::Initialize();
CertLoader::Initialize();
@@ -313,6 +317,9 @@ class DBusServices {
CrosDBusService::Shutdown();
+ // Shutdown the PowerDataCollector before shutting down DBusThreadManager.
+ PowerDataCollector::Shutdown();
+
// NOTE: This must only be called if Initialize() was called.
DBusThreadManager::Shutdown();
}
« no previous file with comments | « no previous file | chromeos/chromeos.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698