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

Side by Side Diff: ash/mus/root_window_controller.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 | « ash/mus/root_window_controller.h ('k') | ash/mus/screenlock_layout.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 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 "ash/mus/root_window_controller.h" 5 #include "ash/mus/root_window_controller.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <map> 9 #include <map>
10 #include <sstream> 10 #include <sstream>
(...skipping 14 matching lines...) Expand all
25 #include "ash/mus/container_ids.h" 25 #include "ash/mus/container_ids.h"
26 #include "ash/mus/non_client_frame_controller.h" 26 #include "ash/mus/non_client_frame_controller.h"
27 #include "ash/mus/property_util.h" 27 #include "ash/mus/property_util.h"
28 #include "ash/mus/screenlock_layout.h" 28 #include "ash/mus/screenlock_layout.h"
29 #include "ash/mus/shelf_layout_manager.h" 29 #include "ash/mus/shelf_layout_manager.h"
30 #include "ash/mus/status_layout_manager.h" 30 #include "ash/mus/status_layout_manager.h"
31 #include "ash/mus/window_manager.h" 31 #include "ash/mus/window_manager.h"
32 #include "base/bind.h" 32 #include "base/bind.h"
33 #include "base/command_line.h" 33 #include "base/command_line.h"
34 #include "base/memory/ptr_util.h" 34 #include "base/memory/ptr_util.h"
35 #include "components/mus/common/switches.h"
36 #include "components/mus/common/util.h"
37 #include "components/mus/public/cpp/property_type_converters.h"
38 #include "components/mus/public/cpp/window.h"
39 #include "components/mus/public/cpp/window_property.h"
40 #include "components/mus/public/cpp/window_tree_client.h"
41 #include "components/mus/public/cpp/window_tree_host_factory.h"
42 #include "mojo/public/cpp/bindings/type_converter.h" 35 #include "mojo/public/cpp/bindings/type_converter.h"
43 #include "services/shell/public/cpp/connector.h" 36 #include "services/shell/public/cpp/connector.h"
37 #include "services/ui/common/switches.h"
38 #include "services/ui/common/util.h"
39 #include "services/ui/public/cpp/property_type_converters.h"
40 #include "services/ui/public/cpp/window.h"
41 #include "services/ui/public/cpp/window_property.h"
42 #include "services/ui/public/cpp/window_tree_client.h"
43 #include "services/ui/public/cpp/window_tree_host_factory.h"
44 #include "ui/display/mojo/display_type_converters.h" 44 #include "ui/display/mojo/display_type_converters.h"
45 45
46 using ash::mojom::Container; 46 using ash::mojom::Container;
47 47
48 namespace ash { 48 namespace ash {
49 namespace mus { 49 namespace mus {
50 namespace { 50 namespace {
51 51
52 class WorkspaceLayoutManagerDelegateImpl 52 class WorkspaceLayoutManagerDelegateImpl
53 : public wm::WorkspaceLayoutManagerDelegate { 53 : public wm::WorkspaceLayoutManagerDelegate {
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 base::WrapUnique(new DockedWindowLayoutManager(docked_container))); 255 base::WrapUnique(new DockedWindowLayoutManager(docked_container)));
256 256
257 WmWindowMus* panel_container = 257 WmWindowMus* panel_container =
258 GetWindowByShellWindowId(kShellWindowId_PanelContainer); 258 GetWindowByShellWindowId(kShellWindowId_PanelContainer);
259 panel_container->SetLayoutManager( 259 panel_container->SetLayoutManager(
260 base::WrapUnique(new PanelLayoutManager(panel_container))); 260 base::WrapUnique(new PanelLayoutManager(panel_container)));
261 } 261 }
262 262
263 } // namespace mus 263 } // namespace mus
264 } // namespace ash 264 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/root_window_controller.h ('k') | ash/mus/screenlock_layout.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698