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 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
370 content::BrowserThread::FILE), | 371 content::BrowserThread::FILE), |
371 load_oem_statistics); | 372 load_oem_statistics); |
372 | 373 |
373 base::FilePath downloads_directory; | 374 base::FilePath downloads_directory; |
374 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); | 375 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); |
375 | 376 |
376 DeviceOAuth2TokenServiceFactory::Initialize(); | 377 DeviceOAuth2TokenServiceFactory::Initialize(); |
377 | 378 |
378 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); | 379 wake_on_wifi_manager_.reset(new WakeOnWifiManager()); |
379 | 380 |
| 381 // We must start observing the MetricsService before it is started/stopped in |
| 382 // ChromeBrowserMainPartsLinux::PreMainMessageLoopRun() below; |
| 383 chromeos::ResourceReporter::StartObservingMetricsService(); |
| 384 |
380 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); | 385 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); |
381 } | 386 } |
382 | 387 |
383 void ChromeBrowserMainPartsChromeos::PreProfileInit() { | 388 void ChromeBrowserMainPartsChromeos::PreProfileInit() { |
384 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() | 389 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() |
385 // -- immediately before Profile creation(). | 390 // -- immediately before Profile creation(). |
386 | 391 |
387 // Now that the file thread exists we can record our stats. | 392 // Now that the file thread exists we can record our stats. |
388 BootTimesRecorder::Get()->RecordChromeMainStats(); | 393 BootTimesRecorder::Get()->RecordChromeMainStats(); |
389 LoginEventRecorder::Get()->SetDelegate(BootTimesRecorder::Get()); | 394 LoginEventRecorder::Get()->SetDelegate(BootTimesRecorder::Get()); |
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
679 scoped_ptr<ui::EventRewriter>(new SpokenFeedbackEventRewriter())); | 684 scoped_ptr<ui::EventRewriter>(new SpokenFeedbackEventRewriter())); |
680 keyboard_event_rewriters_->AddEventRewriter(scoped_ptr<ui::EventRewriter>( | 685 keyboard_event_rewriters_->AddEventRewriter(scoped_ptr<ui::EventRewriter>( |
681 new EventRewriter(ash::Shell::GetInstance()->sticky_keys_controller()))); | 686 new EventRewriter(ash::Shell::GetInstance()->sticky_keys_controller()))); |
682 keyboard_event_rewriters_->Init(); | 687 keyboard_event_rewriters_->Init(); |
683 | 688 |
684 ChromeBrowserMainPartsLinux::PostBrowserStart(); | 689 ChromeBrowserMainPartsLinux::PostBrowserStart(); |
685 } | 690 } |
686 | 691 |
687 // Shut down services before the browser process, etc are destroyed. | 692 // Shut down services before the browser process, etc are destroyed. |
688 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() { | 693 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() { |
| 694 chromeos::ResourceReporter::StopObservingMetricsService(); |
| 695 |
689 BootTimesRecorder::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", true); | 696 BootTimesRecorder::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", true); |
690 | 697 |
691 // Destroy the application name notifier for Kiosk mode. | 698 // Destroy the application name notifier for Kiosk mode. |
692 KioskModeIdleAppNameNotification::Shutdown(); | 699 KioskModeIdleAppNameNotification::Shutdown(); |
693 | 700 |
694 // Shutdown the upgrade detector for Chrome OS. The upgrade detector | 701 // Shutdown the upgrade detector for Chrome OS. The upgrade detector |
695 // stops monitoring changes from the update engine. | 702 // stops monitoring changes from the update engine. |
696 if (UpgradeDetectorChromeos::GetInstance()) | 703 if (UpgradeDetectorChromeos::GetInstance()) |
697 UpgradeDetectorChromeos::GetInstance()->Shutdown(); | 704 UpgradeDetectorChromeos::GetInstance()->Shutdown(); |
698 | 705 |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
797 // Destroy DBus services immediately after threads are stopped. | 804 // Destroy DBus services immediately after threads are stopped. |
798 dbus_services_.reset(); | 805 dbus_services_.reset(); |
799 | 806 |
800 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 807 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
801 | 808 |
802 // Destroy DeviceSettingsService after g_browser_process. | 809 // Destroy DeviceSettingsService after g_browser_process. |
803 DeviceSettingsService::Shutdown(); | 810 DeviceSettingsService::Shutdown(); |
804 } | 811 } |
805 | 812 |
806 } // namespace chromeos | 813 } // namespace chromeos |
OLD | NEW |