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

Unified Diff: ash/shelf/shelf_layout_manager_unittest.cc

Issue 100903002: Ignore fullscreen windows which are behind other windows for fullscreen mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with master. Created 7 years 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
« no previous file with comments | « ash/shelf/shelf_layout_manager.cc ('k') | ash/wm/gestures/shelf_gesture_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1009ce98d7d55ec4398c5b35945de90c6b90cd87..8dac93d1d2eab50088a05a1df743e4b2b11746fc 100644
--- a/ash/shelf/shelf_layout_manager_unittest.cc
+++ b/ash/shelf/shelf_layout_manager_unittest.cc
@@ -1326,6 +1326,68 @@ TEST_F(ShelfLayoutManagerTest, OpenAppListWithShelfHiddenState) {
EXPECT_EQ(SHELF_HIDDEN, shelf->visibility_state());
}
+// Tests that the shelf is only hidden for a fullscreen window at the front and
+// toggles visibility when another window is activated.
+TEST_F(ShelfLayoutManagerTest, FullscreenWindowInFrontHidesShelf) {
+ ShelfLayoutManager* shelf = GetShelfLayoutManager();
+
+ // Create a window and make it full screen.
+ aura::Window* window1 = CreateTestWindow();
+ window1->SetBounds(gfx::Rect(0, 0, 100, 100));
+ window1->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
+ window1->Show();
+
+ aura::Window* window2 = CreateTestWindow();
+ window2->SetBounds(gfx::Rect(0, 0, 100, 100));
+ window2->Show();
+
+ wm::GetWindowState(window1)->Activate();
+ EXPECT_EQ(SHELF_HIDDEN, shelf->visibility_state());
+
+ wm::GetWindowState(window2)->Activate();
+ EXPECT_EQ(SHELF_VISIBLE, shelf->visibility_state());
+
+ wm::GetWindowState(window1)->Activate();
+ EXPECT_EQ(SHELF_HIDDEN, shelf->visibility_state());
+}
+
+// Test the behavior of the shelf when a window on one display is fullscreen
+// but the other display has the active window.
+TEST_F(ShelfLayoutManagerTest, FullscreenWindowOnSecondDisplay) {
+ if (!SupportsMultipleDisplays())
+ return;
+
+ UpdateDisplay("800x600,800x600");
+ DisplayManager* display_manager = Shell::GetInstance()->display_manager();
+ aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+ Shell::RootWindowControllerList root_window_controllers =
+ Shell::GetAllRootWindowControllers();
+
+ // Create windows on either display.
+ aura::Window* window1 = CreateTestWindow();
+ window1->SetBoundsInScreen(
+ gfx::Rect(0, 0, 100, 100),
+ display_manager->GetDisplayAt(0));
+ window1->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
+ window1->Show();
+
+ aura::Window* window2 = CreateTestWindow();
+ window2->SetBoundsInScreen(
+ gfx::Rect(800, 0, 100, 100),
+ display_manager->GetDisplayAt(1));
+ window2->Show();
+
+ EXPECT_EQ(root_windows[0], window1->GetRootWindow());
+ EXPECT_EQ(root_windows[1], window2->GetRootWindow());
+
+ wm::GetWindowState(window2)->Activate();
+ EXPECT_EQ(SHELF_HIDDEN,
+ root_window_controllers[0]->GetShelfLayoutManager()->visibility_state());
+ EXPECT_EQ(SHELF_VISIBLE,
+ root_window_controllers[1]->GetShelfLayoutManager()->visibility_state());
+}
+
+
#if defined(OS_WIN)
// RootWindow and Display can't resize on Windows Ash. http://crbug.com/165962
#define MAYBE_SetAlignment DISABLED_SetAlignment
« no previous file with comments | « ash/shelf/shelf_layout_manager.cc ('k') | ash/wm/gestures/shelf_gesture_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698