| 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 595 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 606 new locale_util::SwitchLanguageCallback(base::Bind( | 606 new locale_util::SwitchLanguageCallback(base::Bind( |
| 607 &GuestLanguageSetCallbackData::Callback, base::Passed(data.Pass())))); | 607 &GuestLanguageSetCallbackData::Callback, base::Passed(data.Pass())))); |
| 608 User* const user = usermanager->GetUserByProfile(profile); | 608 User* const user = usermanager->GetUserByProfile(profile); |
| 609 usermanager->RespectLocalePreference(profile, user, callback.Pass()); | 609 usermanager->RespectLocalePreference(profile, user, callback.Pass()); |
| 610 } | 610 } |
| 611 | 611 |
| 612 void ChromeBrowserMainPartsChromeos::PostProfileInit() { | 612 void ChromeBrowserMainPartsChromeos::PostProfileInit() { |
| 613 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() | 613 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() |
| 614 // -- just after CreateProfile(). | 614 // -- just after CreateProfile(). |
| 615 | 615 |
| 616 BootTimesLoader::Get()->OnChromeProcessStart(); |
| 617 |
| 616 // Restarting Chrome inside existing user session. Possible cases: | 618 // Restarting Chrome inside existing user session. Possible cases: |
| 617 // 1. Chrome is restarted after crash. | 619 // 1. Chrome is restarted after crash. |
| 618 // 2. Chrome is started in browser_tests skipping the login flow | 620 // 2. Chrome is started in browser_tests skipping the login flow |
| 619 // 3. Chrome is started on dev machine | 621 // 3. Chrome is started on dev machine |
| 620 // i.e. not on Chrome OS device w/o login flow. | 622 // i.e. not on Chrome OS device w/o login flow. |
| 621 if (parsed_command_line().HasSwitch(switches::kLoginUser) && | 623 if (parsed_command_line().HasSwitch(switches::kLoginUser) && |
| 622 !parsed_command_line().HasSwitch(switches::kLoginPassword)) { | 624 !parsed_command_line().HasSwitch(switches::kLoginPassword)) { |
| 623 std::string login_user = login::CanonicalizeUserID( | 625 std::string login_user = login::CanonicalizeUserID( |
| 624 parsed_command_line().GetSwitchValueASCII( | 626 parsed_command_line().GetSwitchValueASCII( |
| 625 chromeos::switches::kLoginUser)); | 627 chromeos::switches::kLoginUser)); |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 863 // Destroy DBus services immediately after threads are stopped. | 865 // Destroy DBus services immediately after threads are stopped. |
| 864 dbus_services_.reset(); | 866 dbus_services_.reset(); |
| 865 | 867 |
| 866 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 868 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 867 | 869 |
| 868 // Destroy DeviceSettingsService after g_browser_process. | 870 // Destroy DeviceSettingsService after g_browser_process. |
| 869 DeviceSettingsService::Shutdown(); | 871 DeviceSettingsService::Shutdown(); |
| 870 } | 872 } |
| 871 | 873 |
| 872 } // namespace chromeos | 874 } // namespace chromeos |
| OLD | NEW |