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

Side by Side Diff: components/mus/ws/display.cc

Issue 1877753003: Move mojo\shell to services\shell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@62scan
Patch Set: . Created 4 years, 8 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 | « components/mus/ws/BUILD.gn ('k') | components/mus/ws/display_binding.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 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 "components/mus/ws/display.h"
6 6
7 #include "base/debug/debugger.h" 7 #include "base/debug/debugger.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "components/mus/common/types.h" 9 #include "components/mus/common/types.h"
10 #include "components/mus/ws/display_binding.h" 10 #include "components/mus/ws/display_binding.h"
11 #include "components/mus/ws/display_manager.h" 11 #include "components/mus/ws/display_manager.h"
12 #include "components/mus/ws/focus_controller.h" 12 #include "components/mus/ws/focus_controller.h"
13 #include "components/mus/ws/platform_display.h" 13 #include "components/mus/ws/platform_display.h"
14 #include "components/mus/ws/platform_display_init_params.h" 14 #include "components/mus/ws/platform_display_init_params.h"
15 #include "components/mus/ws/window_manager_factory_service.h" 15 #include "components/mus/ws/window_manager_factory_service.h"
16 #include "components/mus/ws/window_manager_state.h" 16 #include "components/mus/ws/window_manager_state.h"
17 #include "components/mus/ws/window_server.h" 17 #include "components/mus/ws/window_server.h"
18 #include "components/mus/ws/window_server_delegate.h" 18 #include "components/mus/ws/window_server_delegate.h"
19 #include "components/mus/ws/window_tree.h" 19 #include "components/mus/ws/window_tree.h"
20 #include "components/mus/ws/window_tree_binding.h" 20 #include "components/mus/ws/window_tree_binding.h"
21 #include "mojo/common/common_type_converters.h" 21 #include "mojo/common/common_type_converters.h"
22 #include "mojo/converters/geometry/geometry_type_converters.h" 22 #include "mojo/converters/geometry/geometry_type_converters.h"
23 #include "mojo/shell/public/interfaces/connector.mojom.h" 23 #include "services/shell/public/interfaces/connector.mojom.h"
24 #include "ui/base/cursor/cursor.h" 24 #include "ui/base/cursor/cursor.h"
25 25
26 namespace mus { 26 namespace mus {
27 namespace ws { 27 namespace ws {
28 28
29 Display::Display(WindowServer* window_server, 29 Display::Display(WindowServer* window_server,
30 const PlatformDisplayInitParams& platform_display_init_params) 30 const PlatformDisplayInitParams& platform_display_init_params)
31 : id_(window_server->display_manager()->GetAndAdvanceNextDisplayId()), 31 : id_(window_server->display_manager()->GetAndAdvanceNextDisplayId()),
32 window_server_(window_server), 32 window_server_(window_server),
33 platform_display_(PlatformDisplay::Create(platform_display_init_params)), 33 platform_display_(PlatformDisplay::Create(platform_display_init_params)),
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
482 DCHECK_EQ(0u, window_manager_state_map_.count(id)); 482 DCHECK_EQ(0u, window_manager_state_map_.count(id));
483 } 483 }
484 484
485 void Display::OnWindowManagerFactorySet(WindowManagerFactoryService* service) { 485 void Display::OnWindowManagerFactorySet(WindowManagerFactoryService* service) {
486 if (!binding_) 486 if (!binding_)
487 CreateWindowManagerStateFromService(service); 487 CreateWindowManagerStateFromService(service);
488 } 488 }
489 489
490 } // namespace ws 490 } // namespace ws
491 } // namespace mus 491 } // namespace mus
OLDNEW
« no previous file with comments | « components/mus/ws/BUILD.gn ('k') | components/mus/ws/display_binding.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698