| Index: ash/test/test_shell_delegate.cc
|
| diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
|
| index 8e2fceacf5eac1fa20f0ab562ae3e160f06ff650..401fbb56c29efa78f7eede0ca5a5fee632ccc13a 100644
|
| --- a/ash/test/test_shell_delegate.cc
|
| +++ b/ash/test/test_shell_delegate.cc
|
| @@ -86,6 +86,7 @@ TestShellDelegate::TestShellDelegate()
|
| : num_exit_requests_(0),
|
| multi_profiles_enabled_(false),
|
| force_maximize_on_first_run_(false),
|
| + touch_screen_enabled_in_local_pref_(true),
|
| app_list_presenter_delegate_factory_(new AppListPresenterDelegateFactory(
|
| base::WrapUnique(new AppListViewDelegateFactoryImpl))) {}
|
|
|
| @@ -184,6 +185,18 @@ gfx::Image TestShellDelegate::GetDeprecatedAcceleratorImage() const {
|
| return gfx::Image();
|
| }
|
|
|
| +bool TestShellDelegate::IsTouchscreenEnabledInPrefs(bool is_local) const {
|
| + return is_local ? touch_screen_enabled_in_local_pref_ : true;
|
| +}
|
| +
|
| +void TestShellDelegate::SetTouchscreenEnabledInPrefs(bool enabled,
|
| + bool is_local) {
|
| + if (is_local)
|
| + touch_screen_enabled_in_local_pref_ = enabled;
|
| +}
|
| +
|
| +void TestShellDelegate::UpdateTouchscreenStatusFromPrefs() {}
|
| +
|
| void TestShellDelegate::SetMediaCaptureState(MediaCaptureState state) {
|
| #if defined(OS_CHROMEOS)
|
| static_cast<MediaDelegateImpl*>(WmShell::Get()->media_delegate())
|
|
|