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

Side by Side Diff: ash/wm/window_util_unittest.cc

Issue 2889413002: chromeos: nukes window_state_aura (Closed)
Patch Set: merge, remove include from windows and shuffle functions for declaration Created 3 years, 7 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 unified diff | Download patch
« no previous file with comments | « ash/wm/window_util.cc ('k') | ash/wm/workspace/multi_window_resize_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/test/ash_test_base.h" 7 #include "ash/test/ash_test_base.h"
8 #include "ash/wm/window_positioning_utils.h" 8 #include "ash/wm/window_positioning_utils.h"
9 #include "ash/wm/window_state.h" 9 #include "ash/wm/window_state.h"
10 #include "ash/wm/window_state_aura.h"
11 #include "ash/wm_window.h" 10 #include "ash/wm_window.h"
12 #include "ui/aura/window.h" 11 #include "ui/aura/window.h"
13 #include "ui/display/screen.h" 12 #include "ui/display/screen.h"
14 13
15 namespace ash { 14 namespace ash {
16 namespace wm { 15 namespace wm {
17 16
18 namespace { 17 namespace {
19 18
20 std::string GetAdjustedBounds(const gfx::Rect& visible, 19 std::string GetAdjustedBounds(const gfx::Rect& visible,
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 137
139 EXPECT_TRUE(MoveWindowToDisplay(window.get(), original_display_id)); 138 EXPECT_TRUE(MoveWindowToDisplay(window.get(), original_display_id));
140 EXPECT_EQ(original_display_id, 139 EXPECT_EQ(original_display_id,
141 screen->GetDisplayNearestWindow(window.get()).id()); 140 screen->GetDisplayNearestWindow(window.get()).id());
142 EXPECT_EQ(original_container_id, window->parent()->id()); 141 EXPECT_EQ(original_container_id, window->parent()->id());
143 EXPECT_EQ(original_root, window->GetRootWindow()); 142 EXPECT_EQ(original_root, window->GetRootWindow());
144 } 143 }
145 144
146 } // namespace wm 145 } // namespace wm
147 } // namespace ash 146 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/window_util.cc ('k') | ash/wm/workspace/multi_window_resize_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698