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 615 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
626 | 626 |
627 // Initialize the network portal detector for Chrome OS. The network | 627 // Initialize the network portal detector for Chrome OS. The network |
628 // portal detector starts to listen for notifications from | 628 // portal detector starts to listen for notifications from |
629 // NetworkLibrary about changes in the NetworkManager and initiates | 629 // NetworkLibrary about changes in the NetworkManager and initiates |
630 // captive portal detection for active networks. | 630 // captive portal detection for active networks. |
631 if (NetworkPortalDetector::IsEnabled() && | 631 if (NetworkPortalDetector::IsEnabled() && |
632 NetworkPortalDetector::GetInstance()) { | 632 NetworkPortalDetector::GetInstance()) { |
633 NetworkPortalDetector::GetInstance()->Init(); | 633 NetworkPortalDetector::GetInstance()->Init(); |
634 } | 634 } |
635 | 635 |
636 NotifyDisplayLocalStatePrefChanged(); | 636 LoadDisplayPreferences(); |
637 | 637 |
638 display_configuration_observer_.reset( | 638 display_configuration_observer_.reset( |
639 new DisplayConfigurationObserver()); | 639 new DisplayConfigurationObserver()); |
640 | 640 |
641 automatic_reboot_manager_.reset(new system::AutomaticRebootManager( | 641 automatic_reboot_manager_.reset(new system::AutomaticRebootManager( |
642 scoped_ptr<base::TickClock>(new base::DefaultTickClock))); | 642 scoped_ptr<base::TickClock>(new base::DefaultTickClock))); |
643 | 643 |
644 ChromeBrowserMainPartsLinux::PostProfileInit(); | 644 ChromeBrowserMainPartsLinux::PostProfileInit(); |
645 } | 645 } |
646 | 646 |
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
861 return; | 861 return; |
862 | 862 |
863 // If failed to launch, go back to login screen. | 863 // If failed to launch, go back to login screen. |
864 LOG(ERROR) << "Failed to launch kiosk app. Fall back to login screen"; | 864 LOG(ERROR) << "Failed to launch kiosk app. Fall back to login screen"; |
865 OptionallyRunChromeOSLoginManager(parsed_command_line(), profile()); | 865 OptionallyRunChromeOSLoginManager(parsed_command_line(), profile()); |
866 | 866 |
867 // TODO(xiyuan): Show error message. | 867 // TODO(xiyuan): Show error message. |
868 } | 868 } |
869 | 869 |
870 } // namespace chromeos | 870 } // namespace chromeos |
OLD | NEW |