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

Unified Diff: ash/shelf/shelf_layout_manager_unittest.cc

Issue 27458002: Allow setting different hit test bounds overrides for mouse and touch (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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: ash/shelf/shelf_layout_manager_unittest.cc
diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc
index 519290293353c01aa1b4c36fa4aa964283a0acc3..ece16bffc690c9f2ddf50744f65e06f0642571ab 100644
--- a/ash/shelf/shelf_layout_manager_unittest.cc
+++ b/ash/shelf/shelf_layout_manager_unittest.cc
@@ -580,9 +580,10 @@ void ShelfLayoutManagerTest::RunGestureDragTests(gfx::Vector2d delta) {
EXPECT_EQ(shelf_hidden.ToString(),
GetShelfWidget()->GetWindowBoundsInScreen().ToString());
- // Enter into fullscreen with minimal chrome (immersive fullscreen).
+ // Enter into immersive fullscreen with minimal chrome (browser fullscreen).
widget->SetFullscreen(true);
- window->SetProperty(ash::internal::kFullscreenUsesMinimalChromeKey, true);
+ window->SetProperty(ash::internal::kFullscreenTypeKey,
+ ash::wm::FULLSCREEN_TYPE_IMMERSIVE_MINIMAL_CHROME);
shelf->UpdateVisibilityState();
gfx::Rect bounds_fullscreen = window->bounds();
@@ -614,9 +615,10 @@ void ShelfLayoutManagerTest::RunGestureDragTests(gfx::Vector2d delta) {
GetShelfWidget()->GetWindowBoundsInScreen().ToString());
EXPECT_EQ(bounds_fullscreen.ToString(), window->bounds().ToString());
- // Put the window into fullscreen without any chrome at all (eg tab
- // fullscreen).
- window->SetProperty(ash::internal::kFullscreenUsesMinimalChromeKey, false);
+ // Put the window into immersive fullscreen without any chrome at all
+ // (browser immersive fullscreen + tab fullscreen).
+ window->SetProperty(ash::internal::kFullscreenTypeKey,
+ ash::wm::FULLSCREEN_TYPE_IMMERSIVE_NO_CHROME);
shelf->UpdateVisibilityState();
EXPECT_EQ(SHELF_HIDDEN, shelf->visibility_state());
EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, shelf->auto_hide_behavior());

Powered by Google App Engine
This is Rietveld 408576698