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 656 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
667 suspend_observer_.reset(new SuspendObserver()); | 667 suspend_observer_.reset(new SuspendObserver()); |
668 if (KioskModeSettings::Get()->IsKioskModeEnabled()) { | 668 if (KioskModeSettings::Get()->IsKioskModeEnabled()) { |
669 retail_mode_power_save_blocker_ = content::PowerSaveBlocker::Create( | 669 retail_mode_power_save_blocker_ = content::PowerSaveBlocker::Create( |
670 content::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep, | 670 content::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep, |
671 "Retail mode"); | 671 "Retail mode"); |
672 } | 672 } |
673 chromeos::accessibility::Initialize(); | 673 chromeos::accessibility::Initialize(); |
674 | 674 |
675 peripheral_battery_observer_.reset(new PeripheralBatteryObserver()); | 675 peripheral_battery_observer_.reset(new PeripheralBatteryObserver()); |
676 | 676 |
677 storage_monitor_->Init(); | |
678 | |
679 // Initialize the network portal detector for Chrome OS. The network | 677 // Initialize the network portal detector for Chrome OS. The network |
680 // portal detector starts to listen for notifications from | 678 // portal detector starts to listen for notifications from |
681 // NetworkLibrary about changes in the NetworkManager and initiates | 679 // NetworkLibrary about changes in the NetworkManager and initiates |
682 // captive portal detection for active networks. | 680 // captive portal detection for active networks. |
683 NetworkPortalDetector* detector = NetworkPortalDetector::GetInstance(); | 681 NetworkPortalDetector* detector = NetworkPortalDetector::GetInstance(); |
684 if (NetworkPortalDetector::IsEnabledInCommandLine() && detector) { | 682 if (NetworkPortalDetector::IsEnabledInCommandLine() && detector) { |
685 detector->Init(); | 683 detector->Init(); |
686 #if defined(GOOGLE_CHROME_BUILD) | 684 #if defined(GOOGLE_CHROME_BUILD) |
687 bool is_official_build = true; | 685 bool is_official_build = true; |
688 #else | 686 #else |
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
890 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); | 888 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); |
891 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); | 889 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); |
892 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); | 890 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); |
893 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); | 891 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); |
894 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); | 892 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); |
895 // This is necessary to start the experiment as a side effect. | 893 // This is necessary to start the experiment as a side effect. |
896 trial->group(); | 894 trial->group(); |
897 } | 895 } |
898 | 896 |
899 } // namespace chromeos | 897 } // namespace chromeos |
OLD | NEW |