| 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 572 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 583 content::NotificationService::current()->Notify( | 583 content::NotificationService::current()->Notify( |
| 584 chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, | 584 chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, |
| 585 content::NotificationService::AllSources(), | 585 content::NotificationService::AllSources(), |
| 586 content::Details<Profile>(profile())); | 586 content::Details<Profile>(profile())); |
| 587 UserManager::Get()->SessionStarted(); | 587 UserManager::Get()->SessionStarted(); |
| 588 | 588 |
| 589 // Now is the good time to retrieve other logged in users for this session. | 589 // Now is the good time to retrieve other logged in users for this session. |
| 590 // First user has been already marked as logged in and active in | 590 // First user has been already marked as logged in and active in |
| 591 // PreProfileInit(). Chrome should tread other user in a session as active | 591 // PreProfileInit(). Chrome should tread other user in a session as active |
| 592 // in the background. | 592 // in the background. |
| 593 UserManager::Get()->RestoreActiveSessions(); | 593 UserSessionManager::GetInstance()->RestoreActiveSessions(); |
| 594 } | 594 } |
| 595 | 595 |
| 596 // Initialize the network portal detector for Chrome OS. The network | 596 // Initialize the network portal detector for Chrome OS. The network |
| 597 // portal detector starts to listen for notifications from | 597 // portal detector starts to listen for notifications from |
| 598 // NetworkStateHandler and initiates captive portal detection for | 598 // NetworkStateHandler and initiates captive portal detection for |
| 599 // active networks. Shoule be called before call to | 599 // active networks. Shoule be called before call to |
| 600 // OptionallyRunChromeOSLoginManager, because it depends on | 600 // OptionallyRunChromeOSLoginManager, because it depends on |
| 601 // NetworkPortalDetector. | 601 // NetworkPortalDetector. |
| 602 NetworkPortalDetectorImpl::Initialize( | 602 NetworkPortalDetectorImpl::Initialize( |
| 603 g_browser_process->system_request_context()); | 603 g_browser_process->system_request_context()); |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 816 // Destroy DBus services immediately after threads are stopped. | 816 // Destroy DBus services immediately after threads are stopped. |
| 817 dbus_services_.reset(); | 817 dbus_services_.reset(); |
| 818 | 818 |
| 819 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 819 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 820 | 820 |
| 821 // Destroy DeviceSettingsService after g_browser_process. | 821 // Destroy DeviceSettingsService after g_browser_process. |
| 822 DeviceSettingsService::Shutdown(); | 822 DeviceSettingsService::Shutdown(); |
| 823 } | 823 } |
| 824 | 824 |
| 825 } // namespace chromeos | 825 } // namespace chromeos |
| OLD | NEW |