| 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 504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 515 manager->GetInputMethodUtil()->GetHardwareLoginInputMethodIds(); | 515 manager->GetInputMethodUtil()->GetHardwareLoginInputMethodIds(); |
| 516 ime_state->ChangeInputMethod(login_input_methods[0], | 516 ime_state->ChangeInputMethod(login_input_methods[0], |
| 517 false /* show_message */); | 517 false /* show_message */); |
| 518 } | 518 } |
| 519 | 519 |
| 520 void SetGuestLocale(Profile* const profile) { | 520 void SetGuestLocale(Profile* const profile) { |
| 521 scoped_ptr<GuestLanguageSetCallbackData> data( | 521 scoped_ptr<GuestLanguageSetCallbackData> data( |
| 522 new GuestLanguageSetCallbackData(profile)); | 522 new GuestLanguageSetCallbackData(profile)); |
| 523 locale_util::SwitchLanguageCallback callback(base::Bind( | 523 locale_util::SwitchLanguageCallback callback(base::Bind( |
| 524 &GuestLanguageSetCallbackData::Callback, base::Passed(data.Pass()))); | 524 &GuestLanguageSetCallbackData::Callback, base::Passed(data.Pass()))); |
| 525 user_manager::User* const user = | 525 const 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 BootTimesRecorder::Get()->OnChromeProcessStart(); | 535 BootTimesRecorder::Get()->OnChromeProcessStart(); |
| (...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 767 // Destroy DBus services immediately after threads are stopped. | 767 // Destroy DBus services immediately after threads are stopped. |
| 768 dbus_services_.reset(); | 768 dbus_services_.reset(); |
| 769 | 769 |
| 770 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 770 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 771 | 771 |
| 772 // Destroy DeviceSettingsService after g_browser_process. | 772 // Destroy DeviceSettingsService after g_browser_process. |
| 773 DeviceSettingsService::Shutdown(); | 773 DeviceSettingsService::Shutdown(); |
| 774 } | 774 } |
| 775 | 775 |
| 776 } // namespace chromeos | 776 } // namespace chromeos |
| OLD | NEW |