OLD | NEW |
---|---|
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 Loading... | |
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 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
393 #if defined(ENABLE_ARC) | 394 #if defined(ENABLE_ARC) |
394 arc_bridge_service_.reset(new arc::ArcBridgeService( | 395 arc_bridge_service_.reset(new arc::ArcBridgeService( |
395 content::BrowserThread::GetMessageLoopProxyForThread( | 396 content::BrowserThread::GetMessageLoopProxyForThread( |
396 content::BrowserThread::IO), | 397 content::BrowserThread::IO), |
397 content::BrowserThread::GetMessageLoopProxyForThread( | 398 content::BrowserThread::GetMessageLoopProxyForThread( |
398 content::BrowserThread::FILE))); | 399 content::BrowserThread::FILE))); |
399 arc_bridge_service_->DetectAvailability(); | 400 arc_bridge_service_->DetectAvailability(); |
400 #endif | 401 #endif |
401 | 402 |
402 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); | 403 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); |
404 | |
405 chromeos::ResourceReporter::GetInstance()->StartMonitoring(); | |
Daniel Erat
2015/11/23 23:57:19
it seems a bit weird to me that everything else in
afakhry
2015/11/24 01:52:32
This is an arbitrary decision. It doesn't matter i
| |
403 } | 406 } |
404 | 407 |
405 void ChromeBrowserMainPartsChromeos::PreProfileInit() { | 408 void ChromeBrowserMainPartsChromeos::PreProfileInit() { |
406 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() | 409 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() |
407 // -- immediately before Profile creation(). | 410 // -- immediately before Profile creation(). |
408 | 411 |
409 // Now that the file thread exists we can record our stats. | 412 // Now that the file thread exists we can record our stats. |
410 BootTimesRecorder::Get()->RecordChromeMainStats(); | 413 BootTimesRecorder::Get()->RecordChromeMainStats(); |
411 LoginEventRecorder::Get()->SetDelegate(BootTimesRecorder::Get()); | 414 LoginEventRecorder::Get()->SetDelegate(BootTimesRecorder::Get()); |
412 | 415 |
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
703 scoped_ptr<ui::EventRewriter>(new SpokenFeedbackEventRewriter())); | 706 scoped_ptr<ui::EventRewriter>(new SpokenFeedbackEventRewriter())); |
704 keyboard_event_rewriters_->AddEventRewriter(scoped_ptr<ui::EventRewriter>( | 707 keyboard_event_rewriters_->AddEventRewriter(scoped_ptr<ui::EventRewriter>( |
705 new EventRewriter(ash::Shell::GetInstance()->sticky_keys_controller()))); | 708 new EventRewriter(ash::Shell::GetInstance()->sticky_keys_controller()))); |
706 keyboard_event_rewriters_->Init(); | 709 keyboard_event_rewriters_->Init(); |
707 | 710 |
708 ChromeBrowserMainPartsLinux::PostBrowserStart(); | 711 ChromeBrowserMainPartsLinux::PostBrowserStart(); |
709 } | 712 } |
710 | 713 |
711 // Shut down services before the browser process, etc are destroyed. | 714 // Shut down services before the browser process, etc are destroyed. |
712 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() { | 715 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() { |
716 chromeos::ResourceReporter::GetInstance()->StopMonitoring(); | |
717 | |
713 BootTimesRecorder::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", true); | 718 BootTimesRecorder::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", true); |
714 | 719 |
715 #if defined(ENABLE_ARC) | 720 #if defined(ENABLE_ARC) |
716 arc_bridge_service_->Shutdown(); | 721 arc_bridge_service_->Shutdown(); |
717 #endif | 722 #endif |
718 | 723 |
719 // Destroy the application name notifier for Kiosk mode. | 724 // Destroy the application name notifier for Kiosk mode. |
720 KioskModeIdleAppNameNotification::Shutdown(); | 725 KioskModeIdleAppNameNotification::Shutdown(); |
721 | 726 |
722 // Shutdown the upgrade detector for Chrome OS. The upgrade detector | 727 // Shutdown the upgrade detector for Chrome OS. The upgrade detector |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
825 // Destroy DBus services immediately after threads are stopped. | 830 // Destroy DBus services immediately after threads are stopped. |
826 dbus_services_.reset(); | 831 dbus_services_.reset(); |
827 | 832 |
828 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 833 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
829 | 834 |
830 // Destroy DeviceSettingsService after g_browser_process. | 835 // Destroy DeviceSettingsService after g_browser_process. |
831 DeviceSettingsService::Shutdown(); | 836 DeviceSettingsService::Shutdown(); |
832 } | 837 } |
833 | 838 |
834 } // namespace chromeos | 839 } // namespace chromeos |
OLD | NEW |