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

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 1374283003: Reporting top cpu and memory consumers via rappor on chromeos (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Turn off ResourceReporter on task_management CrOs browser_tests. Created 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/resource_reporter/OWNERS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/chromeos/chrome_browser_main_chromeos.h" 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_switches.h" 10 #include "ash/ash_switches.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 58 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
59 #include "chrome/browser/chromeos/policy/device_local_account.h" 59 #include "chrome/browser/chromeos/policy/device_local_account.h"
60 #include "chrome/browser/chromeos/power/freezer_cgroup_process_manager.h" 60 #include "chrome/browser/chromeos/power/freezer_cgroup_process_manager.h"
61 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h" 61 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h"
62 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h" 62 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h"
63 #include "chrome/browser/chromeos/power/power_button_observer.h" 63 #include "chrome/browser/chromeos/power/power_button_observer.h"
64 #include "chrome/browser/chromeos/power/power_data_collector.h" 64 #include "chrome/browser/chromeos/power/power_data_collector.h"
65 #include "chrome/browser/chromeos/power/power_prefs.h" 65 #include "chrome/browser/chromeos/power/power_prefs.h"
66 #include "chrome/browser/chromeos/power/renderer_freezer.h" 66 #include "chrome/browser/chromeos/power/renderer_freezer.h"
67 #include "chrome/browser/chromeos/profiles/profile_helper.h" 67 #include "chrome/browser/chromeos/profiles/profile_helper.h"
68 #include "chrome/browser/chromeos/resource_reporter/resource_reporter.h"
68 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h " 69 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h "
69 #include "chrome/browser/chromeos/settings/device_settings_service.h" 70 #include "chrome/browser/chromeos/settings/device_settings_service.h"
70 #include "chrome/browser/chromeos/status/data_promo_notification.h" 71 #include "chrome/browser/chromeos/status/data_promo_notification.h"
71 #include "chrome/browser/chromeos/system/input_device_settings.h" 72 #include "chrome/browser/chromeos/system/input_device_settings.h"
72 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h" 73 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h"
73 #include "chrome/browser/defaults.h" 74 #include "chrome/browser/defaults.h"
74 #include "chrome/browser/lifetime/application_lifetime.h" 75 #include "chrome/browser/lifetime/application_lifetime.h"
75 #include "chrome/browser/net/chrome_network_delegate.h" 76 #include "chrome/browser/net/chrome_network_delegate.h"
76 #include "chrome/browser/profiles/profile.h" 77 #include "chrome/browser/profiles/profile.h"
77 #include "chrome/browser/profiles/profile_manager.h" 78 #include "chrome/browser/profiles/profile_manager.h"
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 389
389 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); 390 wake_on_wifi_manager_.reset(new WakeOnWifiManager());
390 391
391 arc_bridge_service_.reset(new arc::ArcBridgeService( 392 arc_bridge_service_.reset(new arc::ArcBridgeService(
392 content::BrowserThread::GetMessageLoopProxyForThread( 393 content::BrowserThread::GetMessageLoopProxyForThread(
393 content::BrowserThread::IO), 394 content::BrowserThread::IO),
394 content::BrowserThread::GetMessageLoopProxyForThread( 395 content::BrowserThread::GetMessageLoopProxyForThread(
395 content::BrowserThread::FILE))); 396 content::BrowserThread::FILE)));
396 arc_bridge_service_->DetectAvailability(); 397 arc_bridge_service_->DetectAvailability();
397 398
399 chromeos::ResourceReporter::GetInstance()->StartMonitoring();
400
398 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); 401 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun();
399 } 402 }
400 403
401 void ChromeBrowserMainPartsChromeos::PreProfileInit() { 404 void ChromeBrowserMainPartsChromeos::PreProfileInit() {
402 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() 405 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
403 // -- immediately before Profile creation(). 406 // -- immediately before Profile creation().
404 407
405 // Now that the file thread exists we can record our stats. 408 // Now that the file thread exists we can record our stats.
406 BootTimesRecorder::Get()->RecordChromeMainStats(); 409 BootTimesRecorder::Get()->RecordChromeMainStats();
407 LoginEventRecorder::Get()->SetDelegate(BootTimesRecorder::Get()); 410 LoginEventRecorder::Get()->SetDelegate(BootTimesRecorder::Get());
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 scoped_ptr<ui::EventRewriter>(new SpokenFeedbackEventRewriter())); 702 scoped_ptr<ui::EventRewriter>(new SpokenFeedbackEventRewriter()));
700 keyboard_event_rewriters_->AddEventRewriter(scoped_ptr<ui::EventRewriter>( 703 keyboard_event_rewriters_->AddEventRewriter(scoped_ptr<ui::EventRewriter>(
701 new EventRewriter(ash::Shell::GetInstance()->sticky_keys_controller()))); 704 new EventRewriter(ash::Shell::GetInstance()->sticky_keys_controller())));
702 keyboard_event_rewriters_->Init(); 705 keyboard_event_rewriters_->Init();
703 706
704 ChromeBrowserMainPartsLinux::PostBrowserStart(); 707 ChromeBrowserMainPartsLinux::PostBrowserStart();
705 } 708 }
706 709
707 // Shut down services before the browser process, etc are destroyed. 710 // Shut down services before the browser process, etc are destroyed.
708 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() { 711 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
712 chromeos::ResourceReporter::GetInstance()->StopMonitoring();
713
709 BootTimesRecorder::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", true); 714 BootTimesRecorder::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", true);
710 715
711 arc_bridge_service_->Shutdown(); 716 arc_bridge_service_->Shutdown();
712 717
713 // Destroy the application name notifier for Kiosk mode. 718 // Destroy the application name notifier for Kiosk mode.
714 KioskModeIdleAppNameNotification::Shutdown(); 719 KioskModeIdleAppNameNotification::Shutdown();
715 720
716 // Shutdown the upgrade detector for Chrome OS. The upgrade detector 721 // Shutdown the upgrade detector for Chrome OS. The upgrade detector
717 // stops monitoring changes from the update engine. 722 // stops monitoring changes from the update engine.
718 if (UpgradeDetectorChromeos::GetInstance()) 723 if (UpgradeDetectorChromeos::GetInstance())
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
819 // Destroy DBus services immediately after threads are stopped. 824 // Destroy DBus services immediately after threads are stopped.
820 dbus_services_.reset(); 825 dbus_services_.reset();
821 826
822 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 827 ChromeBrowserMainPartsLinux::PostDestroyThreads();
823 828
824 // Destroy DeviceSettingsService after g_browser_process. 829 // Destroy DeviceSettingsService after g_browser_process.
825 DeviceSettingsService::Shutdown(); 830 DeviceSettingsService::Shutdown();
826 } 831 }
827 832
828 } // namespace chromeos 833 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/resource_reporter/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698