| Index: chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc
|
| diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc b/chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc
|
| index b06b048ec9fe8f24d2171dcde7600b1c9cb7c5b1..c8b07f58099ca4546d84a8431cf320ca0530c9cf 100644
|
| --- a/chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc
|
| +++ b/chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc
|
| @@ -9,7 +9,6 @@
|
| #include "ash/ash_switches.h"
|
| #include "ash/shell.h"
|
| #include "ash/shell_delegate.h"
|
| -#include "ash/wm/window_properties.h"
|
| #include "ash/wm/window_state.h"
|
| #include "base/command_line.h"
|
| #include "chrome/browser/apps/app_browsertest_util.h"
|
| @@ -23,16 +22,10 @@
|
|
|
| namespace {
|
|
|
| -// Returns true if |window| is in immersive fullscreen. Infer whether |window|
|
| -// is in immersive fullscreen based on whether kFullscreenUsesMinimalChromeKey
|
| -// is set for |window| because DEPS does not allow the test to use BrowserView.
|
| -// (This is not quite right because if a window is in both immersive browser
|
| -// fullscreen and in tab fullscreen, kFullScreenUsesMinimalChromeKey will
|
| -// not be set).
|
| +// Returns true if |window| is in immersive fullscreen.
|
| bool IsInImmersiveFullscreen(BrowserWindow* browser_window) {
|
| - return browser_window->IsFullscreen() &&
|
| - browser_window->GetNativeWindow()->GetProperty(
|
| - ash::internal::kFullscreenUsesMinimalChromeKey);
|
| + return ash::wm::GetWindowState(browser_window->GetNativeWindow())->
|
| + IsImmersiveFullscreen();
|
| }
|
|
|
| } // namespace
|
|
|