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

Side by Side Diff: ash/mus/window_manager_application.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/window_manager_application.h ('k') | ash/mus/window_manager_unittest.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 "ash/mus/window_manager_application.h" 5 #include "ash/mus/window_manager_application.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/common/material_design/material_design_controller.h" 9 #include "ash/common/material_design/material_design_controller.h"
10 #include "ash/common/mojo_interface_factory.h" 10 #include "ash/common/mojo_interface_factory.h"
11 #include "ash/common/wm_shell.h" 11 #include "ash/common/wm_shell.h"
12 #include "ash/mus/accelerators/accelerator_registrar_impl.h" 12 #include "ash/mus/accelerators/accelerator_registrar_impl.h"
13 #include "ash/mus/native_widget_factory_mus.h" 13 #include "ash/mus/native_widget_factory_mus.h"
14 #include "ash/mus/wallpaper_delegate_mus.h" 14 #include "ash/mus/wallpaper_delegate_mus.h"
15 #include "ash/mus/window_manager.h" 15 #include "ash/mus/window_manager.h"
16 #include "base/bind.h" 16 #include "base/bind.h"
17 #include "base/memory/ptr_util.h" 17 #include "base/memory/ptr_util.h"
18 #include "services/shell/public/cpp/connection.h" 18 #include "services/service_manager/public/cpp/connection.h"
19 #include "services/shell/public/cpp/connector.h" 19 #include "services/service_manager/public/cpp/connector.h"
20 #include "services/tracing/public/cpp/provider.h" 20 #include "services/tracing/public/cpp/provider.h"
21 #include "services/ui/common/event_matcher_util.h" 21 #include "services/ui/common/event_matcher_util.h"
22 #include "services/ui/public/cpp/gpu_service.h" 22 #include "services/ui/public/cpp/gpu_service.h"
23 #include "services/ui/public/cpp/window.h" 23 #include "services/ui/public/cpp/window.h"
24 #include "services/ui/public/cpp/window_tree_client.h" 24 #include "services/ui/public/cpp/window_tree_client.h"
25 #include "ui/aura/env.h" 25 #include "ui/aura/env.h"
26 #include "ui/events/event.h" 26 #include "ui/events/event.h"
27 #include "ui/message_center/message_center.h" 27 #include "ui/message_center/message_center.h"
28 #include "ui/views/mus/aura_init.h" 28 #include "ui/views/mus/aura_init.h"
29 #include "ui/views/mus/surface_context_factory.h" 29 #include "ui/views/mus/surface_context_factory.h"
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 base::Bind(&WindowManagerApplication::OnAcceleratorRegistrarDestroyed, 200 base::Bind(&WindowManagerApplication::OnAcceleratorRegistrarDestroyed,
201 base::Unretained(this)))); 201 base::Unretained(this))));
202 } 202 }
203 203
204 void WindowManagerApplication::ScreenlockStateChanged(bool locked) { 204 void WindowManagerApplication::ScreenlockStateChanged(bool locked) {
205 window_manager_->SetScreenLocked(locked); 205 window_manager_->SetScreenLocked(locked);
206 } 206 }
207 207
208 } // namespace mus 208 } // namespace mus
209 } // namespace ash 209 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/window_manager_application.h ('k') | ash/mus/window_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698