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