Commit e5d4478f authored by Scott Violet's avatar Scott Violet Committed by Commit Bot

chromeos: update ImmersiveFullscreenControllerTestApi

for single-process-ash. Specifically to get the Env from the Widget not
the static.

BUG=847992
TEST=covered by tests

Change-Id: I508f5cbd6dabaecea00cedd05f1702db37df9a2c
Reviewed-on: https://chromium-review.googlesource.com/1176375Reviewed-by: default avatarEvan Stade <estade@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#583413}
parent c4ba43ad
...@@ -7,7 +7,9 @@ ...@@ -7,7 +7,9 @@
#include "ash/public/cpp/immersive/immersive_fullscreen_controller.h" #include "ash/public/cpp/immersive/immersive_fullscreen_controller.h"
#include "ash/public/cpp/immersive/immersive_fullscreen_controller_delegate.h" #include "ash/public/cpp/immersive/immersive_fullscreen_controller_delegate.h"
#include "ui/aura/env.h" #include "ui/aura/env.h"
#include "ui/aura/window.h"
#include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/rect.h"
#include "ui/views/widget/widget.h"
namespace ash { namespace ash {
...@@ -32,7 +34,10 @@ void ImmersiveFullscreenControllerTestApi::SetupForTest() { ...@@ -32,7 +34,10 @@ void ImmersiveFullscreenControllerTestApi::SetupForTest() {
bottommost_in_screen = bounds_in_screen[i].bottom(); bottommost_in_screen = bounds_in_screen[i].bottom();
} }
gfx::Point cursor_pos(0, bottommost_in_screen + 10); gfx::Point cursor_pos(0, bottommost_in_screen + 10);
aura::Env::GetInstance()->SetLastMouseLocation(cursor_pos); immersive_fullscreen_controller_->widget()
->GetNativeView()
->env()
->SetLastMouseLocation(cursor_pos);
immersive_fullscreen_controller_->UpdateLocatedEventRevealedLock(); immersive_fullscreen_controller_->UpdateLocatedEventRevealedLock();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment