Skip to content

Commit

Permalink
fix a crash on exiting tablet mode
Browse files Browse the repository at this point in the history
Bug: 831423
Test: None
Change-Id: If8e8a2e88d009dfea258b79f6b914444f28816ee
Reviewed-on: https://chromium-review.googlesource.com/1024735
Reviewed-by: Dan Erat <derat@chromium.org>
Commit-Queue: Jun Mukai <mukai@chromium.org>
Cr-Commit-Position: refs/heads/master@{#552948}
  • Loading branch information
jmuk authored and Commit Bot committed Apr 24, 2018
1 parent f227db3 commit f14c969
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions ash/touch/touch_devices_controller.cc
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ void TouchDevicesController::UpdateTouchpadEnabled() {
if (!GetInputDeviceControllerClient())
return; // Happens in tests.

bool enabled = global_touchpad_enabled_ &&
GetActivePrefService()->GetBoolean(prefs::kTouchpadEnabled);
bool enabled = GetTouchpadEnabled(TouchDeviceEnabledSource::GLOBAL) &&
GetTouchpadEnabled(TouchDeviceEnabledSource::USER_PREF);

GetInputDeviceControllerClient()->SetInternalTouchpadEnabled(
enabled, base::BindRepeating(&OnSetTouchpadEnabledDone, enabled));
Expand Down

0 comments on commit f14c969

Please sign in to comment.