| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 538 // cache. If Chrome crashes later in the session, the policy becomes | 538 // cache. If Chrome crashes later in the session, the policy becomes |
| 539 // completely unavailable. Exit the session in that case, rather than | 539 // completely unavailable. Exit the session in that case, rather than |
| 540 // allowing it to continue without policy. | 540 // allowing it to continue without policy. |
| 541 chrome::AttemptUserExit(); | 541 chrome::AttemptUserExit(); |
| 542 return; | 542 return; |
| 543 } | 543 } |
| 544 | 544 |
| 545 // In case of multi-profiles --login-profile will contain user_id_hash. | 545 // In case of multi-profiles --login-profile will contain user_id_hash. |
| 546 std::string user_id_hash = | 546 std::string user_id_hash = |
| 547 parsed_command_line().GetSwitchValueASCII(switches::kLoginProfile); | 547 parsed_command_line().GetSwitchValueASCII(switches::kLoginProfile); |
| 548 user_manager->UserLoggedIn(account_id, user_id_hash, true); | 548 session_manager::SessionManager::Get()->CreateSessionForRestart( |
| 549 account_id, user_id_hash); |
| 549 VLOG(1) << "Relaunching browser for user: " << account_id.Serialize() | 550 VLOG(1) << "Relaunching browser for user: " << account_id.Serialize() |
| 550 << " with hash: " << user_id_hash; | 551 << " with hash: " << user_id_hash; |
| 551 } | 552 } |
| 552 } | 553 } |
| 553 | 554 |
| 554 class GuestLanguageSetCallbackData { | 555 class GuestLanguageSetCallbackData { |
| 555 public: | 556 public: |
| 556 explicit GuestLanguageSetCallbackData(Profile* profile) : profile(profile) { | 557 explicit GuestLanguageSetCallbackData(Profile* profile) : profile(profile) { |
| 557 } | 558 } |
| 558 | 559 |
| (...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 886 // Destroy DBus services immediately after threads are stopped. | 887 // Destroy DBus services immediately after threads are stopped. |
| 887 dbus_services_.reset(); | 888 dbus_services_.reset(); |
| 888 | 889 |
| 889 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 890 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 890 | 891 |
| 891 // Destroy DeviceSettingsService after g_browser_process. | 892 // Destroy DeviceSettingsService after g_browser_process. |
| 892 DeviceSettingsService::Shutdown(); | 893 DeviceSettingsService::Shutdown(); |
| 893 } | 894 } |
| 894 | 895 |
| 895 } // namespace chromeos | 896 } // namespace chromeos |
| OLD | NEW |