Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Unified Diff: chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc

Issue 32943006: [Refactor] Replace kFullscreenUsesMinimalChromeKey with WindowState::hide_shelf_when_fullscreen() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 036b4ba223088932139a2f5547fb07264fbda92a..6d30bb79a0ff70933c6316dbd231f66d9353efc7 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc
@@ -10,7 +10,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"
@@ -24,15 +23,15 @@
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).
+// is in immersive fullscreen based on whether the shelf is hidden when
+// |window| is fullscreen because DEPS does not allow the test to use
+// BrowserView. (This is not quite right because the shelf is hidden if a window
+// is in both immersive fullscreen and tab fullscreen.)
bool IsInImmersiveFullscreen(BrowserWindow* browser_window) {
- return browser_window->IsFullscreen() &&
- browser_window->GetNativeWindow()->GetProperty(
- ash::internal::kFullscreenUsesMinimalChromeKey);
+ ash::wm::WindowState* window_state = ash::wm::GetWindowState(
+ browser_window->GetNativeWindow());
+ return window_state->IsFullscreen() &&
+ !window_state->hide_shelf_when_fullscreen();
}
} // namespace

Powered by Google App Engine
This is Rietveld 408576698