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

Side by Side Diff: ash/display/display_manager_unittest.cc

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (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/display/cursor_window_controller.cc ('k') | ash/display/display_util.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 "ui/display/manager/display_manager.h" 5 #include "ui/display/manager/display_manager.h"
6 6
7 #include "ash/accelerators/accelerator_commands_aura.h" 7 #include "ash/accelerators/accelerator_commands_aura.h"
8 #include "ash/common/ash_switches.h" 8 #include "ash/ash_switches.h"
9 #include "ash/common/wm/window_state.h"
10 #include "ash/display/display_configuration_controller.h" 9 #include "ash/display/display_configuration_controller.h"
11 #include "ash/display/display_util.h" 10 #include "ash/display/display_util.h"
12 #include "ash/display/mirror_window_controller.h" 11 #include "ash/display/mirror_window_controller.h"
13 #include "ash/display/window_tree_host_manager.h" 12 #include "ash/display/window_tree_host_manager.h"
14 #include "ash/screen_util.h" 13 #include "ash/screen_util.h"
15 #include "ash/shell.h" 14 #include "ash/shell.h"
16 #include "ash/strings/grit/ash_strings.h" 15 #include "ash/strings/grit/ash_strings.h"
17 #include "ash/test/ash_test_base.h" 16 #include "ash/test/ash_test_base.h"
18 #include "ash/test/mirror_window_test_api.h" 17 #include "ash/test/mirror_window_test_api.h"
18 #include "ash/wm/window_state.h"
19 #include "ash/wm/window_state_aura.h" 19 #include "ash/wm/window_state_aura.h"
20 #include "base/command_line.h" 20 #include "base/command_line.h"
21 #include "base/format_macros.h" 21 #include "base/format_macros.h"
22 #include "base/strings/string_number_conversions.h" 22 #include "base/strings/string_number_conversions.h"
23 #include "base/strings/stringprintf.h" 23 #include "base/strings/stringprintf.h"
24 #include "build/build_config.h" 24 #include "build/build_config.h"
25 #include "ui/aura/client/aura_constants.h" 25 #include "ui/aura/client/aura_constants.h"
26 #include "ui/aura/env.h" 26 #include "ui/aura/env.h"
27 #include "ui/aura/window_observer.h" 27 #include "ui/aura/window_observer.h"
28 #include "ui/aura/window_tree_host.h" 28 #include "ui/aura/window_tree_host.h"
(...skipping 2918 matching lines...) Expand 10 before | Expand all | Expand 10 after
2947 display::DisplayIdList list = display::test::CreateDisplayIdList2(id1, id2); 2947 display::DisplayIdList list = display::test::CreateDisplayIdList2(id1, id2);
2948 layout_store->RegisterLayoutForDisplayIdList(list, std::move(old_layout)); 2948 layout_store->RegisterLayoutForDisplayIdList(list, std::move(old_layout));
2949 const display::DisplayLayout& stored = 2949 const display::DisplayLayout& stored =
2950 layout_store->GetRegisteredDisplayLayout(list); 2950 layout_store->GetRegisteredDisplayLayout(list);
2951 2951
2952 EXPECT_EQ(id1, stored.placement_list[0].parent_display_id); 2952 EXPECT_EQ(id1, stored.placement_list[0].parent_display_id);
2953 EXPECT_EQ(id2, stored.placement_list[0].display_id); 2953 EXPECT_EQ(id2, stored.placement_list[0].display_id);
2954 } 2954 }
2955 2955
2956 } // namespace ash 2956 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/cursor_window_controller.cc ('k') | ash/display/display_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698