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

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: mpearson's comments Created 5 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) 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 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 content::BrowserThread::FILE), 380 content::BrowserThread::FILE),
380 load_oem_statistics); 381 load_oem_statistics);
381 382
382 base::FilePath downloads_directory; 383 base::FilePath downloads_directory;
383 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); 384 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory));
384 385
385 DeviceOAuth2TokenServiceFactory::Initialize(); 386 DeviceOAuth2TokenServiceFactory::Initialize();
386 387
387 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); 388 wake_on_wifi_manager_.reset(new WakeOnWifiManager());
388 389
390 // We must start observing the MetricsService before it is started/stopped in
391 // ChromeBrowserMainPartsLinux::PreMainMessageLoopRun() below;
392 chromeos::ResourceReporter::StartObservingMetricsService();
393
389 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); 394 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun();
390 } 395 }
391 396
392 void ChromeBrowserMainPartsChromeos::PreProfileInit() { 397 void ChromeBrowserMainPartsChromeos::PreProfileInit() {
393 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() 398 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
394 // -- immediately before Profile creation(). 399 // -- immediately before Profile creation().
395 400
396 // Now that the file thread exists we can record our stats. 401 // Now that the file thread exists we can record our stats.
397 BootTimesRecorder::Get()->RecordChromeMainStats(); 402 BootTimesRecorder::Get()->RecordChromeMainStats();
398 LoginEventRecorder::Get()->SetDelegate(BootTimesRecorder::Get()); 403 LoginEventRecorder::Get()->SetDelegate(BootTimesRecorder::Get());
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
690 scoped_ptr<ui::EventRewriter>(new SpokenFeedbackEventRewriter())); 695 scoped_ptr<ui::EventRewriter>(new SpokenFeedbackEventRewriter()));
691 keyboard_event_rewriters_->AddEventRewriter(scoped_ptr<ui::EventRewriter>( 696 keyboard_event_rewriters_->AddEventRewriter(scoped_ptr<ui::EventRewriter>(
692 new EventRewriter(ash::Shell::GetInstance()->sticky_keys_controller()))); 697 new EventRewriter(ash::Shell::GetInstance()->sticky_keys_controller())));
693 keyboard_event_rewriters_->Init(); 698 keyboard_event_rewriters_->Init();
694 699
695 ChromeBrowserMainPartsLinux::PostBrowserStart(); 700 ChromeBrowserMainPartsLinux::PostBrowserStart();
696 } 701 }
697 702
698 // Shut down services before the browser process, etc are destroyed. 703 // Shut down services before the browser process, etc are destroyed.
699 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() { 704 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
705 chromeos::ResourceReporter::StopObservingMetricsService();
706
700 BootTimesRecorder::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", true); 707 BootTimesRecorder::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", true);
701 708
702 // Destroy the application name notifier for Kiosk mode. 709 // Destroy the application name notifier for Kiosk mode.
703 KioskModeIdleAppNameNotification::Shutdown(); 710 KioskModeIdleAppNameNotification::Shutdown();
704 711
705 // Shutdown the upgrade detector for Chrome OS. The upgrade detector 712 // Shutdown the upgrade detector for Chrome OS. The upgrade detector
706 // stops monitoring changes from the update engine. 713 // stops monitoring changes from the update engine.
707 if (UpgradeDetectorChromeos::GetInstance()) 714 if (UpgradeDetectorChromeos::GetInstance())
708 UpgradeDetectorChromeos::GetInstance()->Shutdown(); 715 UpgradeDetectorChromeos::GetInstance()->Shutdown();
709 716
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
808 // Destroy DBus services immediately after threads are stopped. 815 // Destroy DBus services immediately after threads are stopped.
809 dbus_services_.reset(); 816 dbus_services_.reset();
810 817
811 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 818 ChromeBrowserMainPartsLinux::PostDestroyThreads();
812 819
813 // Destroy DeviceSettingsService after g_browser_process. 820 // Destroy DeviceSettingsService after g_browser_process.
814 DeviceSettingsService::Shutdown(); 821 DeviceSettingsService::Shutdown();
815 } 822 }
816 823
817 } // namespace chromeos 824 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/resource_reporter/resource_reporter.h » ('j') | tools/metrics/histograms/histograms.xml » ('J')

Powered by Google App Engine
This is Rietveld 408576698