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

Side by Side Diff: chrome/browser/chrome_browser_main.cc

Issue 560553005: Battery impact UMA (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix review comments Created 6 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chrome_browser_main.h" 5 #include "chrome/browser/chrome_browser_main.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 #include "components/signin/core/common/profile_management_switches.h" 109 #include "components/signin/core/common/profile_management_switches.h"
110 #include "components/startup_metric_utils/startup_metric_utils.h" 110 #include "components/startup_metric_utils/startup_metric_utils.h"
111 #include "components/translate/content/common/cld_data_source.h" 111 #include "components/translate/content/common/cld_data_source.h"
112 #include "components/translate/core/browser/translate_download_manager.h" 112 #include "components/translate/core/browser/translate_download_manager.h"
113 #include "components/variations/variations_http_header_provider.h" 113 #include "components/variations/variations_http_header_provider.h"
114 #include "content/public/browser/browser_thread.h" 114 #include "content/public/browser/browser_thread.h"
115 #include "content/public/browser/notification_observer.h" 115 #include "content/public/browser/notification_observer.h"
116 #include "content/public/browser/notification_registrar.h" 116 #include "content/public/browser/notification_registrar.h"
117 #include "content/public/browser/notification_service.h" 117 #include "content/public/browser/notification_service.h"
118 #include "content/public/browser/notification_types.h" 118 #include "content/public/browser/notification_types.h"
119 #include "content/public/browser/power_usage_monitor.h"
119 #include "content/public/browser/site_instance.h" 120 #include "content/public/browser/site_instance.h"
120 #include "content/public/common/content_client.h" 121 #include "content/public/common/content_client.h"
121 #include "content/public/common/content_switches.h" 122 #include "content/public/common/content_switches.h"
122 #include "content/public/common/main_function_params.h" 123 #include "content/public/common/main_function_params.h"
123 #include "grit/platform_locale_settings.h" 124 #include "grit/platform_locale_settings.h"
124 #include "net/base/net_module.h" 125 #include "net/base/net_module.h"
125 #include "net/base/sdch_manager.h" 126 #include "net/base/sdch_manager.h"
126 #include "net/cookies/cookie_monster.h" 127 #include "net/cookies/cookie_monster.h"
127 #include "net/http/http_network_layer.h" 128 #include "net/http/http_network_layer.h"
128 #include "net/http/http_stream_factory.h" 129 #include "net/http/http_stream_factory.h"
(...skipping 1417 matching lines...) Expand 10 before | Expand all | Expand 10 after
1546 profile_->GetPrefs()); 1547 profile_->GetPrefs());
1547 } 1548 }
1548 1549
1549 run_message_loop_ = true; 1550 run_message_loop_ = true;
1550 } else { 1551 } else {
1551 run_message_loop_ = false; 1552 run_message_loop_ = false;
1552 } 1553 }
1553 browser_creator_.reset(); 1554 browser_creator_.reset();
1554 #endif // !defined(OS_ANDROID) 1555 #endif // !defined(OS_ANDROID)
1555 1556
1557 #if !defined(OS_LINUX) || defined(OS_CHROMEOS) // http://crbug.com/426393
1558 if (g_browser_process->metrics_service()->reporting_active())
1559 content::StartPowerUsageMonitor();
1560 #endif
1561
1556 #if !defined(OS_ANDROID) 1562 #if !defined(OS_ANDROID)
1557 process_power_collector_.reset(new ProcessPowerCollector); 1563 process_power_collector_.reset(new ProcessPowerCollector);
1558 process_power_collector_->Initialize(); 1564 process_power_collector_->Initialize();
1559 #endif 1565 #endif
1560 1566
1561 PostBrowserStart(); 1567 PostBrowserStart();
1562 1568
1563 if (parameters().ui_task) { 1569 if (parameters().ui_task) {
1564 parameters().ui_task->Run(); 1570 parameters().ui_task->Run();
1565 delete parameters().ui_task; 1571 delete parameters().ui_task;
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
1676 chromeos::CrosSettings::Shutdown(); 1682 chromeos::CrosSettings::Shutdown();
1677 #endif 1683 #endif
1678 #endif 1684 #endif
1679 } 1685 }
1680 1686
1681 // Public members: 1687 // Public members:
1682 1688
1683 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1689 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1684 chrome_extra_parts_.push_back(parts); 1690 chrome_extra_parts_.push_back(parts);
1685 } 1691 }
OLDNEW
« no previous file with comments | « no previous file | content/browser/power_usage_monitor_impl.h » ('j') | content/browser/power_usage_monitor_impl.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698