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 28 matching lines...) Expand all Loading... |
39 #include "chrome/browser/chromeos/imageburner/burn_manager.h" | 39 #include "chrome/browser/chromeos/imageburner/burn_manager.h" |
40 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" | 40 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" |
41 #include "chrome/browser/chromeos/input_method/input_method_manager.h" | 41 #include "chrome/browser/chromeos/input_method/input_method_manager.h" |
42 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h" | 42 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h" |
43 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h" | 43 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h" |
44 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" | 44 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" |
45 #include "chrome/browser/chromeos/login/authenticator.h" | 45 #include "chrome/browser/chromeos/login/authenticator.h" |
46 #include "chrome/browser/chromeos/login/login_utils.h" | 46 #include "chrome/browser/chromeos/login/login_utils.h" |
47 #include "chrome/browser/chromeos/login/login_wizard.h" | 47 #include "chrome/browser/chromeos/login/login_wizard.h" |
48 #include "chrome/browser/chromeos/login/screen_locker.h" | 48 #include "chrome/browser/chromeos/login/screen_locker.h" |
| 49 #include "chrome/browser/chromeos/login/startup_utils.h" |
49 #include "chrome/browser/chromeos/login/user_manager.h" | 50 #include "chrome/browser/chromeos/login/user_manager.h" |
50 #include "chrome/browser/chromeos/login/wallpaper_manager.h" | 51 #include "chrome/browser/chromeos/login/wallpaper_manager.h" |
51 #include "chrome/browser/chromeos/login/wizard_controller.h" | 52 #include "chrome/browser/chromeos/login/wizard_controller.h" |
52 #include "chrome/browser/chromeos/memory/low_memory_observer.h" | 53 #include "chrome/browser/chromeos/memory/low_memory_observer.h" |
53 #include "chrome/browser/chromeos/memory/oom_priority_manager.h" | 54 #include "chrome/browser/chromeos/memory/oom_priority_manager.h" |
54 #include "chrome/browser/chromeos/net/connectivity_state_helper.h" | 55 #include "chrome/browser/chromeos/net/connectivity_state_helper.h" |
55 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h" | 56 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h" |
56 #include "chrome/browser/chromeos/net/network_change_notifier_network_library.h" | 57 #include "chrome/browser/chromeos/net/network_change_notifier_network_library.h" |
57 #include "chrome/browser/chromeos/net/network_portal_detector.h" | 58 #include "chrome/browser/chromeos/net/network_portal_detector.h" |
58 #include "chrome/browser/chromeos/power/brightness_observer.h" | 59 #include "chrome/browser/chromeos/power/brightness_observer.h" |
(...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
665 NetworkPortalDetector* detector = NetworkPortalDetector::GetInstance(); | 666 NetworkPortalDetector* detector = NetworkPortalDetector::GetInstance(); |
666 if (NetworkPortalDetector::IsEnabledInCommandLine() && detector) { | 667 if (NetworkPortalDetector::IsEnabledInCommandLine() && detector) { |
667 detector->Init(); | 668 detector->Init(); |
668 #if defined(GOOGLE_CHROME_BUILD) | 669 #if defined(GOOGLE_CHROME_BUILD) |
669 bool is_official_build = true; | 670 bool is_official_build = true; |
670 #else | 671 #else |
671 bool is_official_build = false; | 672 bool is_official_build = false; |
672 #endif | 673 #endif |
673 // Enable portal detector if EULA was previously accepted or if | 674 // Enable portal detector if EULA was previously accepted or if |
674 // this is an unofficial build. | 675 // this is an unofficial build. |
675 if (!is_official_build || WizardController::IsEulaAccepted()) | 676 if (!is_official_build || StartupUtils::IsEulaAccepted()) |
676 detector->Enable(true); | 677 detector->Enable(true); |
677 } | 678 } |
678 | 679 |
679 display_configuration_observer_.reset( | 680 display_configuration_observer_.reset( |
680 new DisplayConfigurationObserver()); | 681 new DisplayConfigurationObserver()); |
681 | 682 |
682 automatic_reboot_manager_.reset(new system::AutomaticRebootManager( | 683 automatic_reboot_manager_.reset(new system::AutomaticRebootManager( |
683 scoped_ptr<base::TickClock>(new base::DefaultTickClock))); | 684 scoped_ptr<base::TickClock>(new base::DefaultTickClock))); |
684 | 685 |
685 // This observer cannot be created earlier because it requires the shell to be | 686 // This observer cannot be created earlier because it requires the shell to be |
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
858 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); | 859 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); |
859 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); | 860 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); |
860 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); | 861 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); |
861 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); | 862 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); |
862 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); | 863 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); |
863 // This is necessary to start the experiment as a side effect. | 864 // This is necessary to start the experiment as a side effect. |
864 trial->group(); | 865 trial->group(); |
865 } | 866 } |
866 | 867 |
867 } // namespace chromeos | 868 } // namespace chromeos |
OLD | NEW |