Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(196)

Side by Side Diff: chrome/browser/chromeos/login/existing_user_controller.cc

Issue 779103002: Revert of Various changes required to support ChromeVox Next to read Views and Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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"
47 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h" 46 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
48 #include "chrome/common/chrome_switches.h" 47 #include "chrome/common/chrome_switches.h"
49 #include "chrome/common/chrome_version_info.h" 48 #include "chrome/common/chrome_version_info.h"
50 #include "chrome/common/url_constants.h" 49 #include "chrome/common/url_constants.h"
51 #include "chrome/grit/generated_resources.h" 50 #include "chrome/grit/generated_resources.h"
52 #include "chromeos/chromeos_switches.h" 51 #include "chromeos/chromeos_switches.h"
53 #include "chromeos/dbus/dbus_thread_manager.h" 52 #include "chromeos/dbus/dbus_thread_manager.h"
54 #include "chromeos/dbus/power_manager_client.h" 53 #include "chromeos/dbus/power_manager_client.h"
55 #include "chromeos/dbus/session_manager_client.h" 54 #include "chromeos/dbus/session_manager_client.h"
56 #include "chromeos/login/user_names.h" 55 #include "chromeos/login/user_names.h"
(...skipping 1096 matching lines...) Expand 10 before | Expand all | Expand 10 after
1153 1152
1154 login_display_->SetUIEnabled(true); 1153 login_display_->SetUIEnabled(true);
1155 login_display_->ShowGaiaPasswordChanged(username); 1154 login_display_->ShowGaiaPasswordChanged(username);
1156 } 1155 }
1157 1156
1158 void ExistingUserController::SendAccessibilityAlert( 1157 void ExistingUserController::SendAccessibilityAlert(
1159 const std::string& alert_text) { 1158 const std::string& alert_text) {
1160 AccessibilityAlertInfo event(ProfileHelper::GetSigninProfile(), alert_text); 1159 AccessibilityAlertInfo event(ProfileHelper::GetSigninProfile(), alert_text);
1161 SendControlAccessibilityNotification( 1160 SendControlAccessibilityNotification(
1162 ui::AX_EVENT_VALUE_CHANGED, &event); 1161 ui::AX_EVENT_VALUE_CHANGED, &event);
1163
1164 AutomationManagerAsh::GetInstance()->HandleAlert(
1165 ProfileHelper::GetSigninProfile(), alert_text);
1166 } 1162 }
1167 1163
1168 void ExistingUserController::SetPublicSessionKeyboardLayoutAndLogin( 1164 void ExistingUserController::SetPublicSessionKeyboardLayoutAndLogin(
1169 const UserContext& user_context, 1165 const UserContext& user_context,
1170 scoped_ptr<base::ListValue> keyboard_layouts) { 1166 scoped_ptr<base::ListValue> keyboard_layouts) {
1171 UserContext new_user_context = user_context; 1167 UserContext new_user_context = user_context;
1172 std::string keyboard_layout; 1168 std::string keyboard_layout;
1173 for (size_t i = 0; i < keyboard_layouts->GetSize(); ++i) { 1169 for (size_t i = 0; i < keyboard_layouts->GetSize(); ++i) {
1174 base::DictionaryValue* entry = NULL; 1170 base::DictionaryValue* entry = NULL;
1175 keyboard_layouts->GetDictionary(i, &entry); 1171 keyboard_layouts->GetDictionary(i, &entry);
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
1227 is_login_in_progress_ = false; 1223 is_login_in_progress_ = false;
1228 1224
1229 // Reenable clicking on other windows and status area. 1225 // Reenable clicking on other windows and status area.
1230 login_display_->SetUIEnabled(true); 1226 login_display_->SetUIEnabled(true);
1231 1227
1232 if (start_public_session_timer) 1228 if (start_public_session_timer)
1233 StartPublicSessionAutoLoginTimer(); 1229 StartPublicSessionAutoLoginTimer();
1234 } 1230 }
1235 1231
1236 } // namespace chromeos 1232 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/input_method/accessibility.cc ('k') | chrome/browser/extensions/component_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698