| OLD | NEW | 
|---|
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "ash/wm/window_util.h" | 5 #include "ash/wm/window_util.h" | 
| 6 | 6 | 
| 7 #include "ash/common/wm/window_positioning_utils.h" |  | 
| 8 #include "ash/common/wm/window_state.h" |  | 
| 9 #include "ash/common/wm_window.h" | 7 #include "ash/common/wm_window.h" | 
| 10 #include "ash/test/ash_test_base.h" | 8 #include "ash/test/ash_test_base.h" | 
|  | 9 #include "ash/wm/window_positioning_utils.h" | 
|  | 10 #include "ash/wm/window_state.h" | 
| 11 #include "ash/wm/window_state_aura.h" | 11 #include "ash/wm/window_state_aura.h" | 
| 12 #include "ui/aura/window.h" | 12 #include "ui/aura/window.h" | 
| 13 #include "ui/display/manager/display_manager.h" | 13 #include "ui/display/manager/display_manager.h" | 
| 14 #include "ui/display/screen.h" | 14 #include "ui/display/screen.h" | 
| 15 | 15 | 
| 16 namespace ash { | 16 namespace ash { | 
| 17 namespace wm { | 17 namespace wm { | 
| 18 | 18 | 
| 19 namespace { | 19 namespace { | 
| 20 | 20 | 
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 140 | 140 | 
| 141   EXPECT_TRUE(MoveWindowToDisplay(window.get(), original_display_id)); | 141   EXPECT_TRUE(MoveWindowToDisplay(window.get(), original_display_id)); | 
| 142   EXPECT_EQ(original_display_id, | 142   EXPECT_EQ(original_display_id, | 
| 143             screen->GetDisplayNearestWindow(window.get()).id()); | 143             screen->GetDisplayNearestWindow(window.get()).id()); | 
| 144   EXPECT_EQ(original_container_id, window->parent()->id()); | 144   EXPECT_EQ(original_container_id, window->parent()->id()); | 
| 145   EXPECT_EQ(original_root, window->GetRootWindow()); | 145   EXPECT_EQ(original_root, window->GetRootWindow()); | 
| 146 } | 146 } | 
| 147 | 147 | 
| 148 }  // namespace wm | 148 }  // namespace wm | 
| 149 }  // namespace ash | 149 }  // namespace ash | 
| OLD | NEW | 
|---|