services/ui/ws/display.cc - Issue 2119963002: Move mus to //services/ui

Side by Side Diff: services/ui/ws/display.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

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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 "components/mus/ws/display.h"	5 #include "services/ui/ws/display.h"

6	6

7 #include <set>	7 #include <set>

8 #include <vector>	8 #include <vector>

9	9

10 #include "base/debug/debugger.h"	10 #include "base/debug/debugger.h"

11 #include "base/strings/utf_string_conversions.h"	11 #include "base/strings/utf_string_conversions.h"

12 #include "components/mus/common/types.h"

13 #include "components/mus/ws/display_binding.h"

14 #include "components/mus/ws/display_manager.h"

15 #include "components/mus/ws/focus_controller.h"

16 #include "components/mus/ws/platform_display.h"

17 #include "components/mus/ws/platform_display_init_params.h"

18 #include "components/mus/ws/user_activity_monitor.h"

19 #include "components/mus/ws/window_manager_display_root.h"

20 #include "components/mus/ws/window_manager_state.h"

21 #include "components/mus/ws/window_manager_window_tree_factory.h"

22 #include "components/mus/ws/window_server.h"

23 #include "components/mus/ws/window_server_delegate.h"

24 #include "components/mus/ws/window_tree.h"

25 #include "components/mus/ws/window_tree_binding.h"

26 #include "mojo/common/common_type_converters.h"	12 #include "mojo/common/common_type_converters.h"

27 #include "services/shell/public/interfaces/connector.mojom.h"	13 #include "services/shell/public/interfaces/connector.mojom.h"

	14 #include "services/ui/common/types.h"

	15 #include "services/ui/ws/display_binding.h"

	16 #include "services/ui/ws/display_manager.h"

	17 #include "services/ui/ws/focus_controller.h"

	18 #include "services/ui/ws/platform_display.h"

	19 #include "services/ui/ws/platform_display_init_params.h"

	20 #include "services/ui/ws/user_activity_monitor.h"

	21 #include "services/ui/ws/window_manager_display_root.h"

	22 #include "services/ui/ws/window_manager_state.h"

	23 #include "services/ui/ws/window_manager_window_tree_factory.h"

	24 #include "services/ui/ws/window_server.h"

	25 #include "services/ui/ws/window_server_delegate.h"

	26 #include "services/ui/ws/window_tree.h"

	27 #include "services/ui/ws/window_tree_binding.h"

28 #include "ui/base/cursor/cursor.h"	28 #include "ui/base/cursor/cursor.h"

29	29

30 namespace mus {	30 namespace mus {

31 namespace ws {	31 namespace ws {

32	32

33 Display::Display(WindowServer* window_server,	33 Display::Display(WindowServer* window_server,

34 const PlatformDisplayInitParams& platform_display_init_params)	34 const PlatformDisplayInitParams& platform_display_init_params)

35 : id_(window_server->display_manager()->GetAndAdvanceNextDisplayId()),	35 : id_(window_server->display_manager()->GetAndAdvanceNextDisplayId()),

36 window_server_(window_server),	36 window_server_(window_server),

37 platform_display_(PlatformDisplay::Create(platform_display_init_params)),	37 platform_display_(PlatformDisplay::Create(platform_display_init_params)),

(...skipping 372 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
410 }	410 }

411	411

412 void Display::OnWindowManagerWindowTreeFactoryReady(	412 void Display::OnWindowManagerWindowTreeFactoryReady(

413 WindowManagerWindowTreeFactory* factory) {	413 WindowManagerWindowTreeFactory* factory) {

414 if (!binding_)	414 if (!binding_)

415 CreateWindowManagerDisplayRootFromFactory(factory);	415 CreateWindowManagerDisplayRootFromFactory(factory);

416 }	416 }

417	417

418 } // namespace ws	418 } // namespace ws

419 } // namespace mus	419 } // namespace mus

OLD	NEW

« no previous file with comments | « services/ui/ws/display.h ('k') | services/ui/ws/display_binding.h » ('j') | no next file with comments »