OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/login/session/user_session_manager.h" | 5 #include "chrome/browser/chromeos/login/session/user_session_manager.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/base_paths.h" | 9 #include "base/base_paths.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 #include "chrome/browser/ui/startup/startup_browser_creator.h" | 66 #include "chrome/browser/ui/startup/startup_browser_creator.h" |
67 #include "chrome/common/chrome_switches.h" | 67 #include "chrome/common/chrome_switches.h" |
68 #include "chrome/common/logging_chrome.h" | 68 #include "chrome/common/logging_chrome.h" |
69 #include "chrome/common/pref_names.h" | 69 #include "chrome/common/pref_names.h" |
70 #include "chromeos/cert_loader.h" | 70 #include "chromeos/cert_loader.h" |
71 #include "chromeos/chromeos_switches.h" | 71 #include "chromeos/chromeos_switches.h" |
72 #include "chromeos/cryptohome/cryptohome_util.h" | 72 #include "chromeos/cryptohome/cryptohome_util.h" |
73 #include "chromeos/dbus/cryptohome_client.h" | 73 #include "chromeos/dbus/cryptohome_client.h" |
74 #include "chromeos/dbus/dbus_thread_manager.h" | 74 #include "chromeos/dbus/dbus_thread_manager.h" |
75 #include "chromeos/dbus/session_manager_client.h" | 75 #include "chromeos/dbus/session_manager_client.h" |
| 76 #include "chromeos/ime/input_method_manager.h" |
76 #include "chromeos/login/user_names.h" | 77 #include "chromeos/login/user_names.h" |
77 #include "chromeos/network/portal_detector/network_portal_detector.h" | 78 #include "chromeos/network/portal_detector/network_portal_detector.h" |
78 #include "chromeos/network/portal_detector/network_portal_detector_strategy.h" | 79 #include "chromeos/network/portal_detector/network_portal_detector_strategy.h" |
79 #include "chromeos/settings/cros_settings_names.h" | 80 #include "chromeos/settings/cros_settings_names.h" |
80 #include "components/component_updater/component_updater_service.h" | 81 #include "components/component_updater/component_updater_service.h" |
81 #include "components/policy/core/common/cloud/cloud_policy_constants.h" | 82 #include "components/policy/core/common/cloud/cloud_policy_constants.h" |
82 #include "components/session_manager/core/session_manager.h" | 83 #include "components/session_manager/core/session_manager.h" |
83 #include "components/signin/core/browser/account_tracker_service.h" | 84 #include "components/signin/core/browser/account_tracker_service.h" |
84 #include "components/signin/core/browser/signin_manager_base.h" | 85 #include "components/signin/core/browser/signin_manager_base.h" |
85 #include "components/user_manager/user.h" | 86 #include "components/user_manager/user.h" |
86 #include "components/user_manager/user_manager.h" | 87 #include "components/user_manager/user_manager.h" |
87 #include "components/user_manager/user_type.h" | 88 #include "components/user_manager/user_type.h" |
88 #include "content/public/browser/browser_thread.h" | 89 #include "content/public/browser/browser_thread.h" |
89 #include "content/public/browser/notification_service.h" | 90 #include "content/public/browser/notification_service.h" |
90 #include "ui/base/ime/chromeos/input_method_manager.h" | |
91 #include "url/gurl.h" | 91 #include "url/gurl.h" |
92 | 92 |
93 #if defined(USE_ATHENA) | 93 #if defined(USE_ATHENA) |
94 #include "athena/main/public/athena_launcher.h" | 94 #include "athena/main/public/athena_launcher.h" |
95 #endif | 95 #endif |
96 | 96 |
97 namespace chromeos { | 97 namespace chromeos { |
98 | 98 |
99 namespace { | 99 namespace { |
100 | 100 |
(...skipping 1378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1479 | 1479 |
1480 // static | 1480 // static |
1481 void UserSessionManager::RunCallbackOnLocaleLoaded( | 1481 void UserSessionManager::RunCallbackOnLocaleLoaded( |
1482 const base::Closure& callback, | 1482 const base::Closure& callback, |
1483 InputEventsBlocker* /* input_events_blocker */, | 1483 InputEventsBlocker* /* input_events_blocker */, |
1484 const locale_util::LanguageSwitchResult& /* result */) { | 1484 const locale_util::LanguageSwitchResult& /* result */) { |
1485 callback.Run(); | 1485 callback.Run(); |
1486 } | 1486 } |
1487 | 1487 |
1488 } // namespace chromeos | 1488 } // namespace chromeos |
OLD | NEW |