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

Side by Side Diff: services/ui/ws/display_unittest.cc

Issue 2119963002: Move mus to //services/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 5 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 | « services/ui/ws/display_manager_delegate.h ('k') | services/ui/ws/event_dispatcher.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 <stdint.h> 5 #include <stdint.h>
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "components/mus/common/types.h" 11 #include "services/ui/common/types.h"
12 #include "components/mus/common/util.h" 12 #include "services/ui/common/util.h"
13 #include "components/mus/public/interfaces/window_tree.mojom.h" 13 #include "services/ui/public/interfaces/window_tree.mojom.h"
14 #include "components/mus/surfaces/surfaces_state.h" 14 #include "services/ui/surfaces/surfaces_state.h"
15 #include "components/mus/ws/display_manager.h" 15 #include "services/ui/ws/display_manager.h"
16 #include "components/mus/ws/ids.h" 16 #include "services/ui/ws/ids.h"
17 #include "components/mus/ws/platform_display.h" 17 #include "services/ui/ws/platform_display.h"
18 #include "components/mus/ws/platform_display_factory.h" 18 #include "services/ui/ws/platform_display_factory.h"
19 #include "components/mus/ws/server_window.h" 19 #include "services/ui/ws/server_window.h"
20 #include "components/mus/ws/test_utils.h" 20 #include "services/ui/ws/test_utils.h"
21 #include "components/mus/ws/window_manager_display_root.h" 21 #include "services/ui/ws/window_manager_display_root.h"
22 #include "components/mus/ws/window_manager_state.h" 22 #include "services/ui/ws/window_manager_state.h"
23 #include "components/mus/ws/window_server.h" 23 #include "services/ui/ws/window_server.h"
24 #include "components/mus/ws/window_server_delegate.h" 24 #include "services/ui/ws/window_server_delegate.h"
25 #include "components/mus/ws/window_tree.h" 25 #include "services/ui/ws/window_tree.h"
26 #include "components/mus/ws/window_tree_binding.h" 26 #include "services/ui/ws/window_tree_binding.h"
27 #include "testing/gtest/include/gtest/gtest.h" 27 #include "testing/gtest/include/gtest/gtest.h"
28 #include "ui/events/event.h" 28 #include "ui/events/event.h"
29 #include "ui/gfx/geometry/rect.h" 29 #include "ui/gfx/geometry/rect.h"
30 30
31 namespace mus { 31 namespace mus {
32 namespace ws { 32 namespace ws {
33 namespace test { 33 namespace test {
34 namespace { 34 namespace {
35 35
36 const UserId kTestId1 = "2"; 36 const UserId kTestId1 = "2";
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 Display* display2 = tree->GetDisplay(root2); 299 Display* display2 = tree->GetDisplay(root2);
300 WindowManagerState* display2_wms = 300 WindowManagerState* display2_wms =
301 display2->GetWindowManagerDisplayRootForUser(kTestId1) 301 display2->GetWindowManagerDisplayRootForUser(kTestId1)
302 ->window_manager_state(); 302 ->window_manager_state();
303 EXPECT_EQ(display1_wms->window_tree(), display2_wms->window_tree()); 303 EXPECT_EQ(display1_wms->window_tree(), display2_wms->window_tree());
304 } 304 }
305 305
306 } // namespace test 306 } // namespace test
307 } // namespace ws 307 } // namespace ws
308 } // namespace mus 308 } // namespace mus
OLDNEW
« no previous file with comments | « services/ui/ws/display_manager_delegate.h ('k') | services/ui/ws/event_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698