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 514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
525 user_manager::User* const user = | 525 user_manager::User* const user = |
526 ProfileHelper::Get()->GetUserByProfile(profile); | 526 ProfileHelper::Get()->GetUserByProfile(profile); |
527 UserSessionManager::GetInstance()->RespectLocalePreference( | 527 UserSessionManager::GetInstance()->RespectLocalePreference( |
528 profile, user, callback); | 528 profile, user, callback); |
529 } | 529 } |
530 | 530 |
531 void ChromeBrowserMainPartsChromeos::PostProfileInit() { | 531 void ChromeBrowserMainPartsChromeos::PostProfileInit() { |
532 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() | 532 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() |
533 // -- just after CreateProfile(). | 533 // -- just after CreateProfile(). |
534 | 534 |
| 535 // Force loading of signin profile if it was not loaded before. It is possible |
| 536 // when we are restoring session or skipping login screen for some other |
| 537 // reason. |
| 538 if (!chromeos::ProfileHelper::IsSigninProfile(profile())) |
| 539 chromeos::ProfileHelper::GetSigninProfile(); |
| 540 |
535 BootTimesRecorder::Get()->OnChromeProcessStart(); | 541 BootTimesRecorder::Get()->OnChromeProcessStart(); |
536 | 542 |
537 // Initialize the network portal detector for Chrome OS. The network | 543 // Initialize the network portal detector for Chrome OS. The network |
538 // portal detector starts to listen for notifications from | 544 // portal detector starts to listen for notifications from |
539 // NetworkStateHandler and initiates captive portal detection for | 545 // NetworkStateHandler and initiates captive portal detection for |
540 // active networks. Should be called before call to CreateSessionManager, | 546 // active networks. Should be called before call to CreateSessionManager, |
541 // because it depends on NetworkPortalDetector. | 547 // because it depends on NetworkPortalDetector. |
542 NetworkPortalDetectorImpl::Initialize( | 548 NetworkPortalDetectorImpl::Initialize( |
543 g_browser_process->system_request_context()); | 549 g_browser_process->system_request_context()); |
544 { | 550 { |
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
767 // Destroy DBus services immediately after threads are stopped. | 773 // Destroy DBus services immediately after threads are stopped. |
768 dbus_services_.reset(); | 774 dbus_services_.reset(); |
769 | 775 |
770 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 776 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
771 | 777 |
772 // Destroy DeviceSettingsService after g_browser_process. | 778 // Destroy DeviceSettingsService after g_browser_process. |
773 DeviceSettingsService::Shutdown(); | 779 DeviceSettingsService::Shutdown(); |
774 } | 780 } |
775 | 781 |
776 } // namespace chromeos | 782 } // namespace chromeos |
OLD | NEW |