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/ui/webui/chromeos/login/signin_screen_handler.h" | 5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 #include "chrome/common/url_constants.h" | 56 #include "chrome/common/url_constants.h" |
57 #include "chrome/grit/chromium_strings.h" | 57 #include "chrome/grit/chromium_strings.h" |
58 #include "chrome/grit/generated_resources.h" | 58 #include "chrome/grit/generated_resources.h" |
59 #include "chromeos/dbus/dbus_thread_manager.h" | 59 #include "chromeos/dbus/dbus_thread_manager.h" |
60 #include "chromeos/dbus/power_manager_client.h" | 60 #include "chromeos/dbus/power_manager_client.h" |
61 #include "chromeos/login/auth/key.h" | 61 #include "chromeos/login/auth/key.h" |
62 #include "chromeos/login/auth/user_context.h" | 62 #include "chromeos/login/auth/user_context.h" |
63 #include "chromeos/network/network_state.h" | 63 #include "chromeos/network/network_state.h" |
64 #include "chromeos/network/network_state_handler.h" | 64 #include "chromeos/network/network_state_handler.h" |
65 #include "chromeos/network/portal_detector/network_portal_detector.h" | 65 #include "chromeos/network/portal_detector/network_portal_detector.h" |
| 66 #include "components/login/localized_values_builder.h" |
66 #include "components/user_manager/user.h" | 67 #include "components/user_manager/user.h" |
67 #include "components/user_manager/user_manager.h" | 68 #include "components/user_manager/user_manager.h" |
68 #include "components/user_manager/user_type.h" | 69 #include "components/user_manager/user_type.h" |
69 #include "content/public/browser/render_frame_host.h" | 70 #include "content/public/browser/render_frame_host.h" |
70 #include "content/public/browser/web_contents.h" | 71 #include "content/public/browser/web_contents.h" |
71 #include "google_apis/gaia/gaia_auth_util.h" | 72 #include "google_apis/gaia/gaia_auth_util.h" |
72 #include "third_party/cros_system_api/dbus/service_constants.h" | 73 #include "third_party/cros_system_api/dbus/service_constants.h" |
73 #include "ui/base/ime/chromeos/ime_keyboard.h" | 74 #include "ui/base/ime/chromeos/ime_keyboard.h" |
74 #include "ui/base/ime/chromeos/input_method_descriptor.h" | 75 #include "ui/base/ime/chromeos/input_method_descriptor.h" |
75 #include "ui/base/ime/chromeos/input_method_manager.h" | 76 #include "ui/base/ime/chromeos/input_method_manager.h" |
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
346 // Otherwise they will end up using another user's locale to log in. | 347 // Otherwise they will end up using another user's locale to log in. |
347 if (!succeed) { | 348 if (!succeed) { |
348 DVLOG(0) << "SetUserInputMethod('" << username | 349 DVLOG(0) << "SetUserInputMethod('" << username |
349 << "'): failed to set user layout. Switching to default."; | 350 << "'): failed to set user layout. Switching to default."; |
350 | 351 |
351 ime_state->SetInputMethodLoginDefault(); | 352 ime_state->SetInputMethodLoginDefault(); |
352 } | 353 } |
353 } | 354 } |
354 | 355 |
355 void SigninScreenHandler::DeclareLocalizedValues( | 356 void SigninScreenHandler::DeclareLocalizedValues( |
356 LocalizedValuesBuilder* builder) { | 357 ::login::LocalizedValuesBuilder* builder) { |
357 builder->Add("passwordHint", IDS_LOGIN_POD_EMPTY_PASSWORD_TEXT); | 358 builder->Add("passwordHint", IDS_LOGIN_POD_EMPTY_PASSWORD_TEXT); |
358 builder->Add("signingIn", IDS_LOGIN_POD_SIGNING_IN); | 359 builder->Add("signingIn", IDS_LOGIN_POD_SIGNING_IN); |
359 builder->Add("podMenuButtonAccessibleName", | 360 builder->Add("podMenuButtonAccessibleName", |
360 IDS_LOGIN_POD_MENU_BUTTON_ACCESSIBLE_NAME); | 361 IDS_LOGIN_POD_MENU_BUTTON_ACCESSIBLE_NAME); |
361 builder->Add("podMenuRemoveItemAccessibleName", | 362 builder->Add("podMenuRemoveItemAccessibleName", |
362 IDS_LOGIN_POD_MENU_REMOVE_ITEM_ACCESSIBLE_NAME); | 363 IDS_LOGIN_POD_MENU_REMOVE_ITEM_ACCESSIBLE_NAME); |
363 builder->Add("passwordFieldAccessibleName", | 364 builder->Add("passwordFieldAccessibleName", |
364 IDS_LOGIN_POD_PASSWORD_FIELD_ACCESSIBLE_NAME); | 365 IDS_LOGIN_POD_PASSWORD_FIELD_ACCESSIBLE_NAME); |
365 builder->Add("signedIn", IDS_SCREEN_LOCK_ACTIVE_USER); | 366 builder->Add("signedIn", IDS_SCREEN_LOCK_ACTIVE_USER); |
366 builder->Add("signinButton", IDS_LOGIN_BUTTON); | 367 builder->Add("signinButton", IDS_LOGIN_BUTTON); |
(...skipping 1015 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1382 return gaia_screen_handler_->frame_error(); | 1383 return gaia_screen_handler_->frame_error(); |
1383 } | 1384 } |
1384 | 1385 |
1385 void SigninScreenHandler::OnCapsLockChanged(bool enabled) { | 1386 void SigninScreenHandler::OnCapsLockChanged(bool enabled) { |
1386 caps_lock_enabled_ = enabled; | 1387 caps_lock_enabled_ = enabled; |
1387 if (page_is_ready()) | 1388 if (page_is_ready()) |
1388 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_); | 1389 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_); |
1389 } | 1390 } |
1390 | 1391 |
1391 } // namespace chromeos | 1392 } // namespace chromeos |
OLD | NEW |