| 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 620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 631 | 631 |
| 632 // Initialize the network portal detector for Chrome OS. The network | 632 // Initialize the network portal detector for Chrome OS. The network |
| 633 // portal detector starts to listen for notifications from | 633 // portal detector starts to listen for notifications from |
| 634 // NetworkLibrary about changes in the NetworkManager and initiates | 634 // NetworkLibrary about changes in the NetworkManager and initiates |
| 635 // captive portal detection for active networks. | 635 // captive portal detection for active networks. |
| 636 if (NetworkPortalDetector::IsEnabled() && | 636 if (NetworkPortalDetector::IsEnabled() && |
| 637 NetworkPortalDetector::GetInstance()) { | 637 NetworkPortalDetector::GetInstance()) { |
| 638 NetworkPortalDetector::GetInstance()->Init(); | 638 NetworkPortalDetector::GetInstance()->Init(); |
| 639 } | 639 } |
| 640 | 640 |
| 641 NotifyDisplayLocalStatePrefChanged(); | 641 LoadDisplayPreferences(); |
| 642 | 642 |
| 643 display_configuration_observer_.reset( | 643 display_configuration_observer_.reset( |
| 644 new DisplayConfigurationObserver()); | 644 new DisplayConfigurationObserver()); |
| 645 | 645 |
| 646 automatic_reboot_manager_.reset(new system::AutomaticRebootManager( | 646 automatic_reboot_manager_.reset(new system::AutomaticRebootManager( |
| 647 scoped_ptr<base::TickClock>(new base::DefaultTickClock))); | 647 scoped_ptr<base::TickClock>(new base::DefaultTickClock))); |
| 648 | 648 |
| 649 ChromeBrowserMainPartsLinux::PostProfileInit(); | 649 ChromeBrowserMainPartsLinux::PostProfileInit(); |
| 650 } | 650 } |
| 651 | 651 |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 854 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); | 854 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); |
| 855 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); | 855 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); |
| 856 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); | 856 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); |
| 857 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); | 857 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); |
| 858 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); | 858 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); |
| 859 // This is necessary to start the experiment as a side effect. | 859 // This is necessary to start the experiment as a side effect. |
| 860 trial->group(); | 860 trial->group(); |
| 861 } | 861 } |
| 862 | 862 |
| 863 } // namespace chromeos | 863 } // namespace chromeos |
| OLD | NEW |