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

Side by Side Diff: ash/mus/root_window_controller.cc

Issue 2161993002: Start using display.mojom.Display in mus+ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@display_traits
Patch Set: Fixes. 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/BUILD.gn ('k') | services/ui/public/cpp/BUILD.gn » ('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 <algorithm> 9 #include <algorithm>
10 #include <map> 10 #include <map>
11 #include <sstream> 11 #include <sstream>
12 #include <string>
13 #include <utility>
14 #include <vector>
12 15
13 #include "ash/common/root_window_controller_common.h" 16 #include "ash/common/root_window_controller_common.h"
14 #include "ash/common/shell_window_ids.h" 17 #include "ash/common/shell_window_ids.h"
15 #include "ash/common/wm/always_on_top_controller.h" 18 #include "ash/common/wm/always_on_top_controller.h"
16 #include "ash/common/wm/container_finder.h" 19 #include "ash/common/wm/container_finder.h"
17 #include "ash/common/wm/dock/docked_window_layout_manager.h" 20 #include "ash/common/wm/dock/docked_window_layout_manager.h"
18 #include "ash/common/wm/panels/panel_layout_manager.h" 21 #include "ash/common/wm/panels/panel_layout_manager.h"
19 #include "ash/common/wm/root_window_layout_manager.h" 22 #include "ash/common/wm/root_window_layout_manager.h"
20 #include "ash/common/wm/workspace/workspace_layout_manager.h" 23 #include "ash/common/wm/workspace/workspace_layout_manager.h"
21 #include "ash/common/wm/workspace/workspace_layout_manager_delegate.h" 24 #include "ash/common/wm/workspace/workspace_layout_manager_delegate.h"
(...skipping 13 matching lines...) Expand all
35 #include "base/memory/ptr_util.h" 38 #include "base/memory/ptr_util.h"
36 #include "mojo/public/cpp/bindings/type_converter.h" 39 #include "mojo/public/cpp/bindings/type_converter.h"
37 #include "services/shell/public/cpp/connector.h" 40 #include "services/shell/public/cpp/connector.h"
38 #include "services/ui/common/switches.h" 41 #include "services/ui/common/switches.h"
39 #include "services/ui/common/util.h" 42 #include "services/ui/common/util.h"
40 #include "services/ui/public/cpp/property_type_converters.h" 43 #include "services/ui/public/cpp/property_type_converters.h"
41 #include "services/ui/public/cpp/window.h" 44 #include "services/ui/public/cpp/window.h"
42 #include "services/ui/public/cpp/window_property.h" 45 #include "services/ui/public/cpp/window_property.h"
43 #include "services/ui/public/cpp/window_tree_client.h" 46 #include "services/ui/public/cpp/window_tree_client.h"
44 #include "services/ui/public/cpp/window_tree_host_factory.h" 47 #include "services/ui/public/cpp/window_tree_host_factory.h"
45 #include "ui/display/mojo/display_type_converters.h"
46 48
47 using ash::mojom::Container; 49 using ash::mojom::Container;
48 50
49 namespace ash { 51 namespace ash {
50 namespace mus { 52 namespace mus {
51 namespace { 53 namespace {
52 54
53 class WorkspaceLayoutManagerDelegateImpl 55 class WorkspaceLayoutManagerDelegateImpl
54 : public wm::WorkspaceLayoutManagerDelegate { 56 : public wm::WorkspaceLayoutManagerDelegate {
55 public: 57 public:
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 base::WrapUnique(new DockedWindowLayoutManager(docked_container))); 257 base::WrapUnique(new DockedWindowLayoutManager(docked_container)));
256 258
257 WmWindowMus* panel_container = 259 WmWindowMus* panel_container =
258 GetWindowByShellWindowId(kShellWindowId_PanelContainer); 260 GetWindowByShellWindowId(kShellWindowId_PanelContainer);
259 panel_container->SetLayoutManager( 261 panel_container->SetLayoutManager(
260 base::WrapUnique(new PanelLayoutManager(panel_container))); 262 base::WrapUnique(new PanelLayoutManager(panel_container)));
261 } 263 }
262 264
263 } // namespace mus 265 } // namespace mus
264 } // namespace ash 266 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/BUILD.gn ('k') | services/ui/public/cpp/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698