| Index: ui/aura/env_input_state_controller.cc
|
| diff --git a/ui/aura/env_input_state_controller.cc b/ui/aura/env_input_state_controller.cc
|
| index 7267f9f730fb16acf3731785463188ac560b774c..7e3b2916174e83790e28939fcaf8af62bde6c631 100644
|
| --- a/ui/aura/env_input_state_controller.cc
|
| +++ b/ui/aura/env_input_state_controller.cc
|
| @@ -63,6 +63,11 @@ void EnvInputStateController::UpdateStateForTouchEvent(
|
| void EnvInputStateController::SetLastMouseLocation(
|
| const Window* root_window,
|
| const gfx::Point& location_in_root) const {
|
| + // If |root_window| is null, we are only using the event to update event
|
| + // states, so we shouldn't update mouse location.
|
| + if (!root_window && Env::GetInstance()->mode() == aura::Env::Mode::MUS)
|
| + return;
|
| +
|
| client::ScreenPositionClient* client =
|
| client::GetScreenPositionClient(root_window);
|
| if (client) {
|
|
|