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/shell.h" | 10 #include "ash/shell.h" |
(...skipping 15 matching lines...) Expand all Loading... |
26 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" | 26 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" |
27 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" | 27 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" |
28 #include "chrome/browser/chromeos/app_mode/kiosk_app_launcher.h" | 28 #include "chrome/browser/chromeos/app_mode/kiosk_app_launcher.h" |
29 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" | 29 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" |
30 #include "chrome/browser/chromeos/audio/audio_handler.h" | 30 #include "chrome/browser/chromeos/audio/audio_handler.h" |
31 #include "chrome/browser/chromeos/boot_times_loader.h" | 31 #include "chrome/browser/chromeos/boot_times_loader.h" |
32 #include "chrome/browser/chromeos/contacts/contact_manager.h" | 32 #include "chrome/browser/chromeos/contacts/contact_manager.h" |
33 #include "chrome/browser/chromeos/cros/cros_library.h" | 33 #include "chrome/browser/chromeos/cros/cros_library.h" |
34 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h" | 34 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h" |
35 #include "chrome/browser/chromeos/display/display_configuration_observer.h" | 35 #include "chrome/browser/chromeos/display/display_configuration_observer.h" |
36 #include "chrome/browser/chromeos/display/display_preferences.h" | |
37 #include "chrome/browser/chromeos/extensions/default_app_order.h" | 36 #include "chrome/browser/chromeos/extensions/default_app_order.h" |
38 #include "chrome/browser/chromeos/external_metrics.h" | 37 #include "chrome/browser/chromeos/external_metrics.h" |
39 #include "chrome/browser/chromeos/imageburner/burn_manager.h" | 38 #include "chrome/browser/chromeos/imageburner/burn_manager.h" |
40 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" | 39 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" |
41 #include "chrome/browser/chromeos/input_method/input_method_manager.h" | 40 #include "chrome/browser/chromeos/input_method/input_method_manager.h" |
42 #include "chrome/browser/chromeos/input_method/xkeyboard.h" | 41 #include "chrome/browser/chromeos/input_method/xkeyboard.h" |
43 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h" | 42 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h" |
44 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h" | 43 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h" |
45 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" | 44 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" |
46 #include "chrome/browser/chromeos/login/authenticator.h" | 45 #include "chrome/browser/chromeos/login/authenticator.h" |
(...skipping 582 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
629 | 628 |
630 // Initialize the network portal detector for Chrome OS. The network | 629 // Initialize the network portal detector for Chrome OS. The network |
631 // portal detector starts to listen for notifications from | 630 // portal detector starts to listen for notifications from |
632 // NetworkLibrary about changes in the NetworkManager and initiates | 631 // NetworkLibrary about changes in the NetworkManager and initiates |
633 // captive portal detection for active networks. | 632 // captive portal detection for active networks. |
634 if (NetworkPortalDetector::IsEnabled() && | 633 if (NetworkPortalDetector::IsEnabled() && |
635 NetworkPortalDetector::GetInstance()) { | 634 NetworkPortalDetector::GetInstance()) { |
636 NetworkPortalDetector::GetInstance()->Init(); | 635 NetworkPortalDetector::GetInstance()->Init(); |
637 } | 636 } |
638 | 637 |
639 LoadDisplayPreferences(); | |
640 | |
641 display_configuration_observer_.reset( | 638 display_configuration_observer_.reset( |
642 new DisplayConfigurationObserver()); | 639 new DisplayConfigurationObserver()); |
643 | 640 |
644 automatic_reboot_manager_.reset(new system::AutomaticRebootManager( | 641 automatic_reboot_manager_.reset(new system::AutomaticRebootManager( |
645 scoped_ptr<base::TickClock>(new base::DefaultTickClock))); | 642 scoped_ptr<base::TickClock>(new base::DefaultTickClock))); |
646 | 643 |
647 // This observer cannot be created earlier because it requires the shell to be | 644 // This observer cannot be created earlier because it requires the shell to be |
648 // available. | 645 // available. |
649 idle_action_warning_observer_.reset(new IdleActionWarningObserver()); | 646 idle_action_warning_observer_.reset(new IdleActionWarningObserver()); |
650 | 647 |
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
856 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); | 853 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); |
857 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); | 854 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); |
858 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); | 855 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); |
859 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); | 856 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); |
860 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); | 857 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); |
861 // This is necessary to start the experiment as a side effect. | 858 // This is necessary to start the experiment as a side effect. |
862 trial->group(); | 859 trial->group(); |
863 } | 860 } |
864 | 861 |
865 } // namespace chromeos | 862 } // namespace chromeos |
OLD | NEW |