Chromium Code Reviews| Index: chrome/browser/chrome_browser_main.cc |
| diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc |
| index b509e20670fb4fb623f76565cb0a90dbb08056be..9e60ab4ba04645c95dbe2de4b49dfe6fcc56d3d0 100644 |
| --- a/chrome/browser/chrome_browser_main.cc |
| +++ b/chrome/browser/chrome_browser_main.cc |
| @@ -116,6 +116,7 @@ |
| #include "content/public/browser/notification_registrar.h" |
| #include "content/public/browser/notification_service.h" |
| #include "content/public/browser/notification_types.h" |
| +#include "content/public/browser/power_usage_monitor.h" |
| #include "content/public/browser/site_instance.h" |
| #include "content/public/common/content_client.h" |
| #include "content/public/common/content_switches.h" |
| @@ -1553,6 +1554,11 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { |
| browser_creator_.reset(); |
| #endif // !defined(OS_ANDROID) |
| +#if !defined(OS_LINUX) // http://crbug.com/426393 |
|
Daniel Erat
2014/10/23 19:05:34
i think that this incorrectly excludes chrome os,
jeremy
2014/10/27 08:25:11
Done.
|
| + if (g_browser_process->metrics_service()->reporting_active()) |
| + content::StartPowerUsageMonitor(); |
| +#endif // !defined(OS_LINUX) |
| + |
| #if !defined(OS_ANDROID) |
| process_power_collector_.reset(new ProcessPowerCollector); |
| process_power_collector_->Initialize(); |