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

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: Remove a now unused global constant 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') | chromeos/power/power_data_collector.h » ('J')
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 13279e87be8f44220b34bfbb98c6703093355752..73109a99d764b4cd7b9ef92afd871862a0cae54e 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -93,6 +93,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"
@@ -338,6 +339,10 @@ ChromeBrowserMainPartsChromeos::~ChromeBrowserMainPartsChromeos() {
if (KioskModeSettings::Get()->IsKioskModeEnabled())
ShutdownKioskModeScreensaver();
+ // Since DBusThreadManager is shutdown via the DBusServices destructor, it is
+ // safe to shutdown the PowerDataCollector here.
+ PowerDataCollector::Shutdown();
+
// To be precise, logout (browser shutdown) is not yet done, but the
// remaining work is negligible, hence we say LogoutDone here.
BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", false);
@@ -399,6 +404,10 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopStart() {
dbus_services_.reset(new internal::DBusServices(parameters()));
+ // Initialize power data collector only after DBusThreadManager is initialized
+ // in the DBusServices.
+ PowerDataCollector::Initialize();
+
ChromeBrowserMainPartsLinux::PostMainMessageLoopStart();
}
« no previous file with comments | « no previous file | chromeos/chromeos.gyp » ('j') | chromeos/power/power_data_collector.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698