| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/existing_user_controller.h" | 5 #include "chrome/browser/chromeos/login/existing_user_controller.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 #include "chrome/browser/chromeos/login/user_flow.h" | 36 #include "chrome/browser/chromeos/login/user_flow.h" |
| 37 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" | 37 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" |
| 38 #include "chrome/browser/chromeos/login/wizard_controller.h" | 38 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| 39 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 39 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
| 40 #include "chrome/browser/chromeos/policy/device_local_account.h" | 40 #include "chrome/browser/chromeos/policy/device_local_account.h" |
| 41 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h" | 41 #include "chrome/browser/chromeos/policy/device_local_account_policy_service.h" |
| 42 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 42 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
| 43 #include "chrome/browser/chromeos/settings/cros_settings.h" | 43 #include "chrome/browser/chromeos/settings/cros_settings.h" |
| 44 #include "chrome/browser/chromeos/system/device_disabling_manager.h" | 44 #include "chrome/browser/chromeos/system/device_disabling_manager.h" |
| 45 #include "chrome/browser/signin/easy_unlock_service.h" | 45 #include "chrome/browser/signin/easy_unlock_service.h" |
| 46 #include "chrome/browser/ui/ash/accessibility/automation_manager_ash.h" |
| 46 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h" | 47 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h" |
| 47 #include "chrome/common/chrome_switches.h" | 48 #include "chrome/common/chrome_switches.h" |
| 48 #include "chrome/common/chrome_version_info.h" | 49 #include "chrome/common/chrome_version_info.h" |
| 49 #include "chrome/common/url_constants.h" | 50 #include "chrome/common/url_constants.h" |
| 50 #include "chrome/grit/generated_resources.h" | 51 #include "chrome/grit/generated_resources.h" |
| 51 #include "chromeos/chromeos_switches.h" | 52 #include "chromeos/chromeos_switches.h" |
| 52 #include "chromeos/dbus/dbus_thread_manager.h" | 53 #include "chromeos/dbus/dbus_thread_manager.h" |
| 53 #include "chromeos/dbus/power_manager_client.h" | 54 #include "chromeos/dbus/power_manager_client.h" |
| 54 #include "chromeos/dbus/session_manager_client.h" | 55 #include "chromeos/dbus/session_manager_client.h" |
| 55 #include "chromeos/login/user_names.h" | 56 #include "chromeos/login/user_names.h" |
| (...skipping 1103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1159 | 1160 |
| 1160 login_display_->SetUIEnabled(true); | 1161 login_display_->SetUIEnabled(true); |
| 1161 login_display_->ShowGaiaPasswordChanged(username); | 1162 login_display_->ShowGaiaPasswordChanged(username); |
| 1162 } | 1163 } |
| 1163 | 1164 |
| 1164 void ExistingUserController::SendAccessibilityAlert( | 1165 void ExistingUserController::SendAccessibilityAlert( |
| 1165 const std::string& alert_text) { | 1166 const std::string& alert_text) { |
| 1166 AccessibilityAlertInfo event(ProfileHelper::GetSigninProfile(), alert_text); | 1167 AccessibilityAlertInfo event(ProfileHelper::GetSigninProfile(), alert_text); |
| 1167 SendControlAccessibilityNotification( | 1168 SendControlAccessibilityNotification( |
| 1168 ui::AX_EVENT_VALUE_CHANGED, &event); | 1169 ui::AX_EVENT_VALUE_CHANGED, &event); |
| 1170 |
| 1171 AutomationManagerAsh::GetInstance()->HandleAlert( |
| 1172 ProfileHelper::GetSigninProfile(), alert_text); |
| 1169 } | 1173 } |
| 1170 | 1174 |
| 1171 void ExistingUserController::SetPublicSessionKeyboardLayoutAndLogin( | 1175 void ExistingUserController::SetPublicSessionKeyboardLayoutAndLogin( |
| 1172 const UserContext& user_context, | 1176 const UserContext& user_context, |
| 1173 scoped_ptr<base::ListValue> keyboard_layouts) { | 1177 scoped_ptr<base::ListValue> keyboard_layouts) { |
| 1174 UserContext new_user_context = user_context; | 1178 UserContext new_user_context = user_context; |
| 1175 std::string keyboard_layout; | 1179 std::string keyboard_layout; |
| 1176 for (size_t i = 0; i < keyboard_layouts->GetSize(); ++i) { | 1180 for (size_t i = 0; i < keyboard_layouts->GetSize(); ++i) { |
| 1177 base::DictionaryValue* entry = NULL; | 1181 base::DictionaryValue* entry = NULL; |
| 1178 keyboard_layouts->GetDictionary(i, &entry); | 1182 keyboard_layouts->GetDictionary(i, &entry); |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1230 is_login_in_progress_ = false; | 1234 is_login_in_progress_ = false; |
| 1231 | 1235 |
| 1232 // Reenable clicking on other windows and status area. | 1236 // Reenable clicking on other windows and status area. |
| 1233 login_display_->SetUIEnabled(true); | 1237 login_display_->SetUIEnabled(true); |
| 1234 | 1238 |
| 1235 if (start_public_session_timer) | 1239 if (start_public_session_timer) |
| 1236 StartPublicSessionAutoLoginTimer(); | 1240 StartPublicSessionAutoLoginTimer(); |
| 1237 } | 1241 } |
| 1238 | 1242 |
| 1239 } // namespace chromeos | 1243 } // namespace chromeos |
| OLD | NEW |