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