| Index: chrome/browser/ui/ash/chrome_shell_delegate.cc
|
| diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
|
| index 9dc97584a7cdcf7c5394bccfa44dcec9f023ec0c..0440d50b677a4609b13976f8977f3224b9468497 100644
|
| --- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
|
| +++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
|
| @@ -500,12 +500,25 @@ gfx::Image ChromeShellDelegate::GetDeprecatedAcceleratorImage() const {
|
| IDR_BLUETOOTH_KEYBOARD);
|
| }
|
|
|
| -void ChromeShellDelegate::ToggleTouchpad() {
|
| - chromeos::system::InputDeviceSettings::Get()->ToggleTouchpad();
|
| +bool ChromeShellDelegate::IsTouchscreenEnabledInPrefs(
|
| + bool use_local_state) const {
|
| + return chromeos::system::InputDeviceSettings::Get()
|
| + ->IsTouchscreenEnabledInPrefs(use_local_state);
|
| +}
|
| +
|
| +void ChromeShellDelegate::SetTouchscreenEnabledInPrefs(bool enabled,
|
| + bool use_local_state) {
|
| + chromeos::system::InputDeviceSettings::Get()->SetTouchscreenEnabledInPrefs(
|
| + enabled, use_local_state);
|
| }
|
|
|
| -void ChromeShellDelegate::ToggleTouchscreen() {
|
| - chromeos::system::InputDeviceSettings::Get()->ToggleTouchscreen();
|
| +void ChromeShellDelegate::UpdateTouchscreenStatusFromPrefs() {
|
| + chromeos::system::InputDeviceSettings::Get()
|
| + ->UpdateTouchscreenStatusFromPrefs();
|
| +}
|
| +
|
| +void ChromeShellDelegate::ToggleTouchpad() {
|
| + chromeos::system::InputDeviceSettings::Get()->ToggleTouchpad();
|
| }
|
|
|
| keyboard::KeyboardUI* ChromeShellDelegate::CreateKeyboardUI() {
|
|
|