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

Unified Diff: ash/shelf/shelf_layout_manager_unittest.cc

Issue 149493008: Use active window if on current workspace for fullscreen mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update fullscreen state tracking in workspace and only consider switchable containers for active no… Created 6 years, 10 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 968d036631ff63bee23b6068a16e2d47477813f4..fe2aa419e6ecd90067bc3f00dd1c1a23261453de 100644
--- a/ash/shelf/shelf_layout_manager_unittest.cc
+++ b/ash/shelf/shelf_layout_manager_unittest.cc
@@ -1309,7 +1309,7 @@ TEST_F(ShelfLayoutManagerTest, OpenAppListWithShelfHiddenState) {
window->SetBounds(gfx::Rect(0, 0, 100, 100));
window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
window->Show();
- wm::ActivateWindow(window);
+ wm::GetWindowState(window)->Activate();
// App list and shelf is not shown.
EXPECT_FALSE(shell->GetAppListTargetVisibility());
@@ -1370,6 +1370,7 @@ TEST_F(ShelfLayoutManagerTest, FullscreenWindowOnSecondDisplay) {
display_manager->GetDisplayAt(0));
window1->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
window1->Show();
+ wm::GetWindowState(window1)->Activate();
oshima 2014/02/14 17:24:26 Does this mean that when we create a single window
flackr 2014/02/14 20:00:02 Correct. This may be to prevent stealing input foc
oshima 2014/02/14 20:09:30 We probably should investigate what's the ideal be
aura::Window* window2 = CreateTestWindow();
window2->SetBoundsInScreen(

Powered by Google App Engine
This is Rietveld 408576698