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( |