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

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

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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/new_window_delegate_mus.cc ('k') | ash/mus/wallpaper_delegate_mus.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 <algorithm> 9 #include <algorithm>
10 #include <map> 10 #include <map>
(...skipping 14 matching lines...) Expand all
25 #include "ash/mus/bridge/wm_window_mus.h" 25 #include "ash/mus/bridge/wm_window_mus.h"
26 #include "ash/mus/container_ids.h" 26 #include "ash/mus/container_ids.h"
27 #include "ash/mus/non_client_frame_controller.h" 27 #include "ash/mus/non_client_frame_controller.h"
28 #include "ash/mus/property_util.h" 28 #include "ash/mus/property_util.h"
29 #include "ash/mus/screenlock_layout.h" 29 #include "ash/mus/screenlock_layout.h"
30 #include "ash/mus/window_manager.h" 30 #include "ash/mus/window_manager.h"
31 #include "base/bind.h" 31 #include "base/bind.h"
32 #include "base/command_line.h" 32 #include "base/command_line.h"
33 #include "base/memory/ptr_util.h" 33 #include "base/memory/ptr_util.h"
34 #include "mojo/public/cpp/bindings/type_converter.h" 34 #include "mojo/public/cpp/bindings/type_converter.h"
35 #include "services/shell/public/cpp/connector.h" 35 #include "services/service_manager/public/cpp/connector.h"
36 #include "services/ui/common/switches.h" 36 #include "services/ui/common/switches.h"
37 #include "services/ui/common/util.h" 37 #include "services/ui/common/util.h"
38 #include "services/ui/public/cpp/property_type_converters.h" 38 #include "services/ui/public/cpp/property_type_converters.h"
39 #include "services/ui/public/cpp/window.h" 39 #include "services/ui/public/cpp/window.h"
40 #include "services/ui/public/cpp/window_property.h" 40 #include "services/ui/public/cpp/window_property.h"
41 #include "services/ui/public/cpp/window_tree_client.h" 41 #include "services/ui/public/cpp/window_tree_client.h"
42 #include "ui/display/display_list.h" 42 #include "ui/display/display_list.h"
43 #include "ui/display/screen_base.h" 43 #include "ui/display/screen_base.h"
44 44
45 using ash::mojom::Container; 45 using ash::mojom::Container;
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 void RootWindowController::CreateLayoutManagers() { 180 void RootWindowController::CreateLayoutManagers() {
181 // Override the default layout managers for certain containers. 181 // Override the default layout managers for certain containers.
182 WmWindowMus* lock_screen_container = 182 WmWindowMus* lock_screen_container =
183 GetWindowByShellWindowId(kShellWindowId_LockScreenContainer); 183 GetWindowByShellWindowId(kShellWindowId_LockScreenContainer);
184 layout_managers_[lock_screen_container->mus_window()].reset( 184 layout_managers_[lock_screen_container->mus_window()].reset(
185 new ScreenlockLayout(lock_screen_container->mus_window())); 185 new ScreenlockLayout(lock_screen_container->mus_window()));
186 } 186 }
187 187
188 } // namespace mus 188 } // namespace mus
189 } // namespace ash 189 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/new_window_delegate_mus.cc ('k') | ash/mus/wallpaper_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698