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 <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
12 #include "ash/common/session/session_state_delegate.h" | 12 #include "ash/common/session/session_state_delegate.h" |
13 #include "ash/common/system/chromeos/devicetype_utils.h" | 13 #include "ash/common/system/chromeos/devicetype_utils.h" |
14 #include "ash/common/wm_shell.h" | 14 #include "ash/common/wm_shell.h" |
| 15 #include "ash/public/interfaces/constants.mojom.h" |
15 #include "ash/shell.h" | 16 #include "ash/shell.h" |
16 #include "ash/wm/lock_state_controller.h" | 17 #include "ash/wm/lock_state_controller.h" |
17 #include "base/bind.h" | 18 #include "base/bind.h" |
18 #include "base/i18n/number_formatting.h" | 19 #include "base/i18n/number_formatting.h" |
19 #include "base/location.h" | 20 #include "base/location.h" |
20 #include "base/logging.h" | 21 #include "base/logging.h" |
21 #include "base/macros.h" | 22 #include "base/macros.h" |
22 #include "base/metrics/histogram_macros.h" | 23 #include "base/metrics/histogram_macros.h" |
23 #include "base/single_thread_task_runner.h" | 24 #include "base/single_thread_task_runner.h" |
24 #include "base/strings/string16.h" | 25 #include "base/strings/string16.h" |
(...skipping 30 matching lines...) Expand all Loading... |
55 #include "chrome/browser/chromeos/login/wizard_controller.h" | 56 #include "chrome/browser/chromeos/login/wizard_controller.h" |
56 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 57 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
57 #include "chrome/browser/chromeos/policy/device_local_account.h" | 58 #include "chrome/browser/chromeos/policy/device_local_account.h" |
58 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 59 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
59 #include "chrome/browser/chromeos/settings/cros_settings.h" | 60 #include "chrome/browser/chromeos/settings/cros_settings.h" |
60 #include "chrome/browser/chromeos/system/system_clock.h" | 61 #include "chrome/browser/chromeos/system/system_clock.h" |
61 #include "chrome/browser/io_thread.h" | 62 #include "chrome/browser/io_thread.h" |
62 #include "chrome/browser/profiles/profile.h" | 63 #include "chrome/browser/profiles/profile.h" |
63 #include "chrome/browser/profiles/profile_metrics.h" | 64 #include "chrome/browser/profiles/profile_metrics.h" |
64 #include "chrome/browser/signin/easy_unlock_service.h" | 65 #include "chrome/browser/signin/easy_unlock_service.h" |
65 #include "chrome/browser/ui/ash/ash_util.h" | |
66 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h" | 66 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h" |
67 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h" | 67 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h" |
68 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h" | 68 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h" |
69 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h" | 69 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h" |
70 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h" | 70 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h" |
71 #include "chrome/common/channel_info.h" | 71 #include "chrome/common/channel_info.h" |
72 #include "chrome/common/pref_names.h" | 72 #include "chrome/common/pref_names.h" |
73 #include "chrome/common/url_constants.h" | 73 #include "chrome/common/url_constants.h" |
74 #include "chrome/grit/chromium_strings.h" | 74 #include "chrome/grit/chromium_strings.h" |
75 #include "chrome/grit/generated_resources.h" | 75 #include "chrome/grit/generated_resources.h" |
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
329 keyboard->AddObserver(this); | 329 keyboard->AddObserver(this); |
330 OnAllowedInputMethodsChanged(); | 330 OnAllowedInputMethodsChanged(); |
331 allowed_input_methods_subscription_ = | 331 allowed_input_methods_subscription_ = |
332 chromeos::CrosSettings::Get()->AddSettingsObserver( | 332 chromeos::CrosSettings::Get()->AddSettingsObserver( |
333 chromeos::kDeviceLoginScreenInputMethods, | 333 chromeos::kDeviceLoginScreenInputMethods, |
334 base::Bind(&SigninScreenHandler::OnAllowedInputMethodsChanged, | 334 base::Bind(&SigninScreenHandler::OnAllowedInputMethodsChanged, |
335 base::Unretained(this))); | 335 base::Unretained(this))); |
336 | 336 |
337 content::ServiceManagerConnection::GetForProcess() | 337 content::ServiceManagerConnection::GetForProcess() |
338 ->GetConnector() | 338 ->GetConnector() |
339 ->BindInterface(ash_util::GetAshServiceName(), &touch_view_manager_ptr_); | 339 ->BindInterface(ash::mojom::kServiceName, &touch_view_manager_ptr_); |
340 touch_view_manager_ptr_->AddObserver( | 340 touch_view_manager_ptr_->AddObserver( |
341 touch_view_binding_.CreateInterfacePtrAndBind()); | 341 touch_view_binding_.CreateInterfacePtrAndBind()); |
342 } | 342 } |
343 | 343 |
344 SigninScreenHandler::~SigninScreenHandler() { | 344 SigninScreenHandler::~SigninScreenHandler() { |
345 OobeUI* oobe_ui = GetOobeUI(); | 345 OobeUI* oobe_ui = GetOobeUI(); |
346 if (oobe_ui && oobe_ui_observer_added_) | 346 if (oobe_ui && oobe_ui_observer_added_) |
347 oobe_ui->RemoveObserver(this); | 347 oobe_ui->RemoveObserver(this); |
348 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver( | 348 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver( |
349 this); | 349 this); |
(...skipping 1295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1645 rate.initial_delay_in_ms = auto_repeat_delay; | 1645 rate.initial_delay_in_ms = auto_repeat_delay; |
1646 rate.repeat_interval_in_ms = auto_repeat_interval; | 1646 rate.repeat_interval_in_ms = auto_repeat_interval; |
1647 input_method::InputMethodManager::Get() | 1647 input_method::InputMethodManager::Get() |
1648 ->GetImeKeyboard() | 1648 ->GetImeKeyboard() |
1649 ->SetAutoRepeatEnabled(true); | 1649 ->SetAutoRepeatEnabled(true); |
1650 input_method::InputMethodManager::Get()->GetImeKeyboard()->SetAutoRepeatRate( | 1650 input_method::InputMethodManager::Get()->GetImeKeyboard()->SetAutoRepeatRate( |
1651 rate); | 1651 rate); |
1652 } | 1652 } |
1653 | 1653 |
1654 } // namespace chromeos | 1654 } // namespace chromeos |
OLD | NEW |