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

Side by Side Diff: ash/root_window_controller_unittest.cc

Issue 2729363002: chromeos: Move files in //ash/common to //ash, part 3 (Closed)
Patch Set: Created 3 years, 9 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.cc ('k') | ash/scoped_root_window_for_new_windows.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 (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/root_window_controller.h" 5 #include "ash/root_window_controller.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "ash/common/session/session_controller.h"
10 #include "ash/common/session/session_state_delegate.h"
11 #include "ash/common/wm_shell.h"
12 #include "ash/common/wm_window.h"
13 #include "ash/public/cpp/shell_window_ids.h" 9 #include "ash/public/cpp/shell_window_ids.h"
10 #include "ash/session/session_controller.h"
11 #include "ash/session/session_state_delegate.h"
14 #include "ash/shell.h" 12 #include "ash/shell.h"
15 #include "ash/system/tray/system_tray_delegate.h" 13 #include "ash/system/tray/system_tray_delegate.h"
16 #include "ash/test/ash_test_base.h" 14 #include "ash/test/ash_test_base.h"
17 #include "ash/wm/system_modal_container_layout_manager.h" 15 #include "ash/wm/system_modal_container_layout_manager.h"
18 #include "ash/wm/window_properties.h" 16 #include "ash/wm/window_properties.h"
19 #include "ash/wm/window_state.h" 17 #include "ash/wm/window_state.h"
20 #include "ash/wm/window_state_aura.h" 18 #include "ash/wm/window_state_aura.h"
21 #include "ash/wm/window_util.h" 19 #include "ash/wm/window_util.h"
20 #include "ash/wm_shell.h"
21 #include "ash/wm_window.h"
22 #include "base/command_line.h" 22 #include "base/command_line.h"
23 #include "ui/aura/client/focus_change_observer.h" 23 #include "ui/aura/client/focus_change_observer.h"
24 #include "ui/aura/client/focus_client.h" 24 #include "ui/aura/client/focus_client.h"
25 #include "ui/aura/client/window_parenting_client.h" 25 #include "ui/aura/client/window_parenting_client.h"
26 #include "ui/aura/env.h" 26 #include "ui/aura/env.h"
27 #include "ui/aura/test/test_window_delegate.h" 27 #include "ui/aura/test/test_window_delegate.h"
28 #include "ui/aura/test/test_windows.h" 28 #include "ui/aura/test/test_windows.h"
29 #include "ui/aura/window.h" 29 #include "ui/aura/window.h"
30 #include "ui/aura/window_event_dispatcher.h" 30 #include "ui/aura/window_event_dispatcher.h"
31 #include "ui/aura/window_tracker.h" 31 #include "ui/aura/window_tracker.h"
(...skipping 1206 matching lines...) Expand 10 before | Expand all | Expand 10 after
1238 keyboard_controller->ui()->GetKeyboardWindow()->SetBounds( 1238 keyboard_controller->ui()->GetKeyboardWindow()->SetBounds(
1239 gfx::Rect(0, 400, 800, 200)); 1239 gfx::Rect(0, 400, 800, 200));
1240 EXPECT_EQ("0,400 800x200", keyboard_container->bounds().ToString()); 1240 EXPECT_EQ("0,400 800x200", keyboard_container->bounds().ToString());
1241 1241
1242 UpdateDisplay("600x800"); 1242 UpdateDisplay("600x800");
1243 EXPECT_EQ("0,600 600x200", keyboard_container->bounds().ToString()); 1243 EXPECT_EQ("0,600 600x200", keyboard_container->bounds().ToString());
1244 } 1244 }
1245 1245
1246 } // namespace test 1246 } // namespace test
1247 } // namespace ash 1247 } // namespace ash
OLDNEW
« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/scoped_root_window_for_new_windows.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698