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

Side by Side Diff: ash/shelf/shelf_layout_manager_unittest.cc

Issue 2438853002: Renames aura::client::WindowTreeClient to WindowParentingClient (Closed)
Patch Set: cleanup Created 4 years, 2 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/root_window_controller_unittest.cc ('k') | ash/test/ash_test_base.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/common/shelf/shelf_layout_manager.h" 5 #include "ash/common/shelf/shelf_layout_manager.h"
6 6
7 #include "ash/aura/wm_shelf_aura.h" 7 #include "ash/aura/wm_shelf_aura.h"
8 #include "ash/aura/wm_window_aura.h" 8 #include "ash/aura/wm_window_aura.h"
9 #include "ash/common/accelerators/accelerator_controller.h" 9 #include "ash/common/accelerators/accelerator_controller.h"
10 #include "ash/common/accelerators/accelerator_table.h" 10 #include "ash/common/accelerators/accelerator_table.h"
(...skipping 15 matching lines...) Expand all
26 #include "ash/root_window_controller.h" 26 #include "ash/root_window_controller.h"
27 #include "ash/shell.h" 27 #include "ash/shell.h"
28 #include "ash/test/ash_test_base.h" 28 #include "ash/test/ash_test_base.h"
29 #include "ash/test/display_manager_test_api.h" 29 #include "ash/test/display_manager_test_api.h"
30 #include "ash/test/test_system_tray_item.h" 30 #include "ash/test/test_system_tray_item.h"
31 #include "ash/wm/window_state_aura.h" 31 #include "ash/wm/window_state_aura.h"
32 #include "ash/wm/window_util.h" 32 #include "ash/wm/window_util.h"
33 #include "base/command_line.h" 33 #include "base/command_line.h"
34 #include "base/run_loop.h" 34 #include "base/run_loop.h"
35 #include "ui/aura/client/aura_constants.h" 35 #include "ui/aura/client/aura_constants.h"
36 #include "ui/aura/client/window_tree_client.h" 36 #include "ui/aura/client/window_parenting_client.h"
37 #include "ui/aura/window.h" 37 #include "ui/aura/window.h"
38 #include "ui/aura/window_event_dispatcher.h" 38 #include "ui/aura/window_event_dispatcher.h"
39 #include "ui/base/ui_base_switches.h" 39 #include "ui/base/ui_base_switches.h"
40 #include "ui/compositor/layer.h" 40 #include "ui/compositor/layer.h"
41 #include "ui/compositor/layer_animator.h" 41 #include "ui/compositor/layer_animator.h"
42 #include "ui/compositor/scoped_animation_duration_scale_mode.h" 42 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
43 #include "ui/display/display.h" 43 #include "ui/display/display.h"
44 #include "ui/display/manager/display_layout.h" 44 #include "ui/display/manager/display_layout.h"
45 #include "ui/display/screen.h" 45 #include "ui/display/screen.h"
46 #include "ui/events/gesture_detection/gesture_configuration.h" 46 #include "ui/events/gesture_detection/gesture_configuration.h"
(...skipping 1993 matching lines...) Expand 10 before | Expand all | Expand 10 after
2040 // Open keyboard in sticky mode. 2040 // Open keyboard in sticky mode.
2041 kb_controller->ShowKeyboard(true); 2041 kb_controller->ShowKeyboard(true);
2042 layout_manager->OnKeyboardBoundsChanging(keyboard_bounds()); 2042 layout_manager->OnKeyboardBoundsChanging(keyboard_bounds());
2043 2043
2044 // Work area should be changed. 2044 // Work area should be changed.
2045 EXPECT_NE(orig_work_area, 2045 EXPECT_NE(orig_work_area,
2046 display::Screen::GetScreen()->GetPrimaryDisplay().work_area()); 2046 display::Screen::GetScreen()->GetPrimaryDisplay().work_area());
2047 } 2047 }
2048 2048
2049 } // namespace ash 2049 } // namespace ash
OLDNEW
« no previous file with comments | « ash/root_window_controller_unittest.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698