| 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 680 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 691 suspend_observer_.reset(new SuspendObserver()); | 691 suspend_observer_.reset(new SuspendObserver()); |
| 692 if (KioskModeSettings::Get()->IsKioskModeEnabled()) { | 692 if (KioskModeSettings::Get()->IsKioskModeEnabled()) { |
| 693 retail_mode_power_save_blocker_ = content::PowerSaveBlocker::Create( | 693 retail_mode_power_save_blocker_ = content::PowerSaveBlocker::Create( |
| 694 content::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep, | 694 content::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep, |
| 695 "Retail mode"); | 695 "Retail mode"); |
| 696 } | 696 } |
| 697 chromeos::accessibility::Initialize(); | 697 chromeos::accessibility::Initialize(); |
| 698 | 698 |
| 699 peripheral_battery_observer_.reset(new PeripheralBatteryObserver()); | 699 peripheral_battery_observer_.reset(new PeripheralBatteryObserver()); |
| 700 | 700 |
| 701 storage_monitor_->Init(); | |
| 702 | |
| 703 // Initialize the network portal detector for Chrome OS. The network | 701 // Initialize the network portal detector for Chrome OS. The network |
| 704 // portal detector starts to listen for notifications from | 702 // portal detector starts to listen for notifications from |
| 705 // NetworkLibrary about changes in the NetworkManager and initiates | 703 // NetworkLibrary about changes in the NetworkManager and initiates |
| 706 // captive portal detection for active networks. | 704 // captive portal detection for active networks. |
| 707 NetworkPortalDetector* detector = NetworkPortalDetector::GetInstance(); | 705 NetworkPortalDetector* detector = NetworkPortalDetector::GetInstance(); |
| 708 if (NetworkPortalDetector::IsEnabledInCommandLine() && detector) { | 706 if (NetworkPortalDetector::IsEnabledInCommandLine() && detector) { |
| 709 detector->Init(); | 707 detector->Init(); |
| 710 #if defined(GOOGLE_CHROME_BUILD) | 708 #if defined(GOOGLE_CHROME_BUILD) |
| 711 bool is_official_build = true; | 709 bool is_official_build = true; |
| 712 #else | 710 #else |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 909 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); | 907 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); |
| 910 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); | 908 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); |
| 911 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); | 909 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); |
| 912 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); | 910 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); |
| 913 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); | 911 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); |
| 914 // This is necessary to start the experiment as a side effect. | 912 // This is necessary to start the experiment as a side effect. |
| 915 trial->group(); | 913 trial->group(); |
| 916 } | 914 } |
| 917 | 915 |
| 918 } // namespace chromeos | 916 } // namespace chromeos |
| OLD | NEW |