| 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 30 matching lines...) Expand all Loading... |
| 41 #include "chrome/browser/chromeos/input_method/input_method_util.h" | 41 #include "chrome/browser/chromeos/input_method/input_method_util.h" |
| 42 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h" | 42 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h" |
| 43 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h" | 43 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h" |
| 44 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" | 44 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" |
| 45 #include "chrome/browser/chromeos/language_preferences.h" | 45 #include "chrome/browser/chromeos/language_preferences.h" |
| 46 #include "chrome/browser/chromeos/login/helper.h" | 46 #include "chrome/browser/chromeos/login/helper.h" |
| 47 #include "chrome/browser/chromeos/login/lock/screen_locker.h" | 47 #include "chrome/browser/chromeos/login/lock/screen_locker.h" |
| 48 #include "chrome/browser/chromeos/login/login_wizard.h" | 48 #include "chrome/browser/chromeos/login/login_wizard.h" |
| 49 #include "chrome/browser/chromeos/login/session/user_session_manager.h" | 49 #include "chrome/browser/chromeos/login/session/user_session_manager.h" |
| 50 #include "chrome/browser/chromeos/login/startup_utils.h" | 50 #include "chrome/browser/chromeos/login/startup_utils.h" |
| 51 #include "chrome/browser/chromeos/login/users/user.h" | |
| 52 #include "chrome/browser/chromeos/login/users/user_manager.h" | 51 #include "chrome/browser/chromeos/login/users/user_manager.h" |
| 53 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" | 52 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" |
| 54 #include "chrome/browser/chromeos/login/wizard_controller.h" | 53 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| 55 #include "chrome/browser/chromeos/memory/oom_priority_manager.h" | 54 #include "chrome/browser/chromeos/memory/oom_priority_manager.h" |
| 56 #include "chrome/browser/chromeos/net/network_portal_detector_impl.h" | 55 #include "chrome/browser/chromeos/net/network_portal_detector_impl.h" |
| 57 #include "chrome/browser/chromeos/options/cert_library.h" | 56 #include "chrome/browser/chromeos/options/cert_library.h" |
| 58 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 57 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
| 59 #include "chrome/browser/chromeos/policy/device_local_account.h" | 58 #include "chrome/browser/chromeos/policy/device_local_account.h" |
| 60 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h" | 59 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h" |
| 61 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h" | 60 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h" |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 #include "chromeos/ime/input_method_manager.h" | 96 #include "chromeos/ime/input_method_manager.h" |
| 98 #include "chromeos/login/login_state.h" | 97 #include "chromeos/login/login_state.h" |
| 99 #include "chromeos/login/user_names.h" | 98 #include "chromeos/login/user_names.h" |
| 100 #include "chromeos/network/network_change_notifier_chromeos.h" | 99 #include "chromeos/network/network_change_notifier_chromeos.h" |
| 101 #include "chromeos/network/network_change_notifier_factory_chromeos.h" | 100 #include "chromeos/network/network_change_notifier_factory_chromeos.h" |
| 102 #include "chromeos/network/network_handler.h" | 101 #include "chromeos/network/network_handler.h" |
| 103 #include "chromeos/system/statistics_provider.h" | 102 #include "chromeos/system/statistics_provider.h" |
| 104 #include "chromeos/tpm_token_loader.h" | 103 #include "chromeos/tpm_token_loader.h" |
| 105 #include "components/metrics/metrics_service.h" | 104 #include "components/metrics/metrics_service.h" |
| 106 #include "components/session_manager/core/session_manager.h" | 105 #include "components/session_manager/core/session_manager.h" |
| 106 #include "components/user_manager/user.h" |
| 107 #include "content/public/browser/browser_thread.h" | 107 #include "content/public/browser/browser_thread.h" |
| 108 #include "content/public/browser/notification_service.h" | 108 #include "content/public/browser/notification_service.h" |
| 109 #include "content/public/browser/power_save_blocker.h" | 109 #include "content/public/browser/power_save_blocker.h" |
| 110 #include "content/public/common/main_function_params.h" | 110 #include "content/public/common/main_function_params.h" |
| 111 #include "grit/platform_locale_settings.h" | 111 #include "grit/platform_locale_settings.h" |
| 112 #include "media/audio/sounds/sounds_manager.h" | 112 #include "media/audio/sounds/sounds_manager.h" |
| 113 #include "net/base/network_change_notifier.h" | 113 #include "net/base/network_change_notifier.h" |
| 114 #include "net/url_request/url_request.h" | 114 #include "net/url_request/url_request.h" |
| 115 #include "net/url_request/url_request_context_getter.h" | 115 #include "net/url_request/url_request_context_getter.h" |
| 116 #include "ui/base/touch/touch_device.h" | 116 #include "ui/base/touch/touch_device.h" |
| (...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 492 ime_manager->GetInputMethodUtil()->GetHardwareLoginInputMethodIds(); | 492 ime_manager->GetInputMethodUtil()->GetHardwareLoginInputMethodIds(); |
| 493 ime_manager->ChangeInputMethod(login_input_methods[0]); | 493 ime_manager->ChangeInputMethod(login_input_methods[0]); |
| 494 } | 494 } |
| 495 | 495 |
| 496 void SetGuestLocale(Profile* const profile) { | 496 void SetGuestLocale(Profile* const profile) { |
| 497 scoped_ptr<GuestLanguageSetCallbackData> data( | 497 scoped_ptr<GuestLanguageSetCallbackData> data( |
| 498 new GuestLanguageSetCallbackData(profile)); | 498 new GuestLanguageSetCallbackData(profile)); |
| 499 scoped_ptr<locale_util::SwitchLanguageCallback> callback( | 499 scoped_ptr<locale_util::SwitchLanguageCallback> callback( |
| 500 new locale_util::SwitchLanguageCallback(base::Bind( | 500 new locale_util::SwitchLanguageCallback(base::Bind( |
| 501 &GuestLanguageSetCallbackData::Callback, base::Passed(data.Pass())))); | 501 &GuestLanguageSetCallbackData::Callback, base::Passed(data.Pass())))); |
| 502 User* const user = ProfileHelper::Get()->GetUserByProfile(profile); | 502 user_manager::User* const user = |
| 503 ProfileHelper::Get()->GetUserByProfile(profile); |
| 503 UserSessionManager::GetInstance()->RespectLocalePreference( | 504 UserSessionManager::GetInstance()->RespectLocalePreference( |
| 504 profile, user, callback.Pass()); | 505 profile, user, callback.Pass()); |
| 505 } | 506 } |
| 506 | 507 |
| 507 void ChromeBrowserMainPartsChromeos::PostProfileInit() { | 508 void ChromeBrowserMainPartsChromeos::PostProfileInit() { |
| 508 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() | 509 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() |
| 509 // -- just after CreateProfile(). | 510 // -- just after CreateProfile(). |
| 510 | 511 |
| 511 BootTimesLoader::Get()->OnChromeProcessStart(); | 512 BootTimesLoader::Get()->OnChromeProcessStart(); |
| 512 | 513 |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 732 // Destroy DBus services immediately after threads are stopped. | 733 // Destroy DBus services immediately after threads are stopped. |
| 733 dbus_services_.reset(); | 734 dbus_services_.reset(); |
| 734 | 735 |
| 735 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 736 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 736 | 737 |
| 737 // Destroy DeviceSettingsService after g_browser_process. | 738 // Destroy DeviceSettingsService after g_browser_process. |
| 738 DeviceSettingsService::Shutdown(); | 739 DeviceSettingsService::Shutdown(); |
| 739 } | 740 } |
| 740 | 741 |
| 741 } // namespace chromeos | 742 } // namespace chromeos |
| OLD | NEW |