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

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

Issue 1921353002: Moves handful of files to ash/wm/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@shell_ids
Patch Set: merge to trunk Created 4 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/lock_layout_manager.cc ('k') | ash/wm/lock_window_state.h » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/display/display_manager.h" 5 #include "ash/display/display_manager.h"
6 #include "ash/root_window_controller.h" 6 #include "ash/root_window_controller.h"
7 #include "ash/screen_util.h" 7 #include "ash/screen_util.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/shell_window_ids.h" 9 #include "ash/shell_window_ids.h"
10 #include "ash/test/ash_test_base.h" 10 #include "ash/test/ash_test_base.h"
11 #include "ash/wm/window_state.h" 11 #include "ash/wm/common/window_state.h"
12 #include "ash/wm/window_state_aura.h" 12 #include "ash/wm/window_state_aura.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "ui/aura/client/aura_constants.h" 14 #include "ui/aura/client/aura_constants.h"
15 #include "ui/aura/window.h" 15 #include "ui/aura/window.h"
16 #include "ui/gfx/screen.h" 16 #include "ui/gfx/screen.h"
17 #include "ui/keyboard/keyboard_controller.h" 17 #include "ui/keyboard/keyboard_controller.h"
18 #include "ui/keyboard/keyboard_switches.h" 18 #include "ui/keyboard/keyboard_switches.h"
19 #include "ui/keyboard/keyboard_ui.h" 19 #include "ui/keyboard/keyboard_ui.h"
20 #include "ui/keyboard/keyboard_util.h" 20 #include "ui/keyboard/keyboard_util.h"
21 #include "ui/views/widget/widget.h" 21 #include "ui/views/widget/widget.h"
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 ScreenUtil::GetDisplayWorkAreaBoundsInParent(window.get()); 295 ScreenUtil::GetDisplayWorkAreaBoundsInParent(window.get());
296 window->SetBounds(work_area); 296 window->SetBounds(work_area);
297 // Usually work_area takes Shelf into account but that doesn't affect 297 // Usually work_area takes Shelf into account but that doesn't affect
298 // LockScreen container windows. 298 // LockScreen container windows.
299 EXPECT_NE(work_area.ToString(), window->GetBoundsInScreen().ToString()); 299 EXPECT_NE(work_area.ToString(), window->GetBoundsInScreen().ToString());
300 EXPECT_EQ(screen_bounds.ToString(), window->GetBoundsInScreen().ToString()); 300 EXPECT_EQ(screen_bounds.ToString(), window->GetBoundsInScreen().ToString());
301 } 301 }
302 302
303 } // namespace test 303 } // namespace test
304 } // namespace ash 304 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/lock_layout_manager.cc ('k') | ash/wm/lock_window_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698