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

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

Issue 1003283002: Enable chrome.automation.getDesktop on all aura platforms. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months 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" 46 #include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h"
47 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h" 47 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
48 #include "chrome/common/chrome_switches.h" 48 #include "chrome/common/chrome_switches.h"
49 #include "chrome/common/chrome_version_info.h" 49 #include "chrome/common/chrome_version_info.h"
50 #include "chrome/common/url_constants.h" 50 #include "chrome/common/url_constants.h"
51 #include "chrome/grit/generated_resources.h" 51 #include "chrome/grit/generated_resources.h"
52 #include "chromeos/chromeos_switches.h" 52 #include "chromeos/chromeos_switches.h"
53 #include "chromeos/dbus/dbus_thread_manager.h" 53 #include "chromeos/dbus/dbus_thread_manager.h"
54 #include "chromeos/dbus/power_manager_client.h" 54 #include "chromeos/dbus/power_manager_client.h"
55 #include "chromeos/dbus/session_manager_client.h" 55 #include "chromeos/dbus/session_manager_client.h"
56 #include "chromeos/login/user_names.h" 56 #include "chromeos/login/user_names.h"
(...skipping 921 matching lines...) Expand 10 before | Expand all | Expand 10 after
978 // changed. 978 // changed.
979 user_manager::UserManager::Get()->SaveUserOAuthStatus( 979 user_manager::UserManager::Get()->SaveUserOAuthStatus(
980 username, user_manager::User::OAUTH2_TOKEN_STATUS_INVALID); 980 username, user_manager::User::OAUTH2_TOKEN_STATUS_INVALID);
981 981
982 login_display_->SetUIEnabled(true); 982 login_display_->SetUIEnabled(true);
983 login_display_->ShowGaiaPasswordChanged(username); 983 login_display_->ShowGaiaPasswordChanged(username);
984 } 984 }
985 985
986 void ExistingUserController::SendAccessibilityAlert( 986 void ExistingUserController::SendAccessibilityAlert(
987 const std::string& alert_text) { 987 const std::string& alert_text) {
988 AutomationManagerAsh::GetInstance()->HandleAlert( 988 AutomationManagerAura::GetInstance()->HandleAlert(
989 ProfileHelper::GetSigninProfile(), alert_text); 989 ProfileHelper::GetSigninProfile(), alert_text);
990 } 990 }
991 991
992 void ExistingUserController::SetPublicSessionKeyboardLayoutAndLogin( 992 void ExistingUserController::SetPublicSessionKeyboardLayoutAndLogin(
993 const UserContext& user_context, 993 const UserContext& user_context,
994 scoped_ptr<base::ListValue> keyboard_layouts) { 994 scoped_ptr<base::ListValue> keyboard_layouts) {
995 UserContext new_user_context = user_context; 995 UserContext new_user_context = user_context;
996 std::string keyboard_layout; 996 std::string keyboard_layout;
997 for (size_t i = 0; i < keyboard_layouts->GetSize(); ++i) { 997 for (size_t i = 0; i < keyboard_layouts->GetSize(); ++i) {
998 base::DictionaryValue* entry = NULL; 998 base::DictionaryValue* entry = NULL;
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
1194 1194
1195 // Setting a customized login user flow to perform additional initializations 1195 // Setting a customized login user flow to perform additional initializations
1196 // for bootstrap after the user session is started. 1196 // for bootstrap after the user session is started.
1197 ChromeUserManager::Get()->SetUserFlow(user_context.GetUserID(), 1197 ChromeUserManager::Get()->SetUserFlow(user_context.GetUserID(),
1198 new BootstrapUserFlow(user_context)); 1198 new BootstrapUserFlow(user_context));
1199 1199
1200 PerformLogin(user_context, LoginPerformer::AUTH_MODE_EXTENSION); 1200 PerformLogin(user_context, LoginPerformer::AUTH_MODE_EXTENSION);
1201 } 1201 }
1202 1202
1203 } // namespace chromeos 1203 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698