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

Side by Side Diff: ui/views/mus/window_manager_connection.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 | « ui/views/mus/window_manager_connection.h ('k') | ui/views/mus/window_tree_host_mus.h » ('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 "ui/views/mus/window_manager_connection.h" 5 #include "ui/views/mus/window_manager_connection.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/lazy_instance.h" 11 #include "base/lazy_instance.h"
12 #include "base/memory/ptr_util.h" 12 #include "base/memory/ptr_util.h"
13 #include "base/threading/thread_local.h" 13 #include "base/threading/thread_local.h"
14 #include "services/shell/public/cpp/connection.h" 14 #include "services/service_manager/public/cpp/connection.h"
15 #include "services/shell/public/cpp/connector.h" 15 #include "services/service_manager/public/cpp/connector.h"
16 #include "services/ui/public/cpp/gpu_service.h" 16 #include "services/ui/public/cpp/gpu_service.h"
17 #include "services/ui/public/cpp/property_type_converters.h" 17 #include "services/ui/public/cpp/property_type_converters.h"
18 #include "services/ui/public/cpp/window.h" 18 #include "services/ui/public/cpp/window.h"
19 #include "services/ui/public/cpp/window_property.h" 19 #include "services/ui/public/cpp/window_property.h"
20 #include "services/ui/public/cpp/window_tree_client.h" 20 #include "services/ui/public/cpp/window_tree_client.h"
21 #include "services/ui/public/interfaces/event_matcher.mojom.h" 21 #include "services/ui/public/interfaces/event_matcher.mojom.h"
22 #include "services/ui/public/interfaces/window_tree.mojom.h" 22 #include "services/ui/public/interfaces/window_tree.mojom.h"
23 #include "ui/aura/env.h" 23 #include "ui/aura/env.h"
24 #include "ui/views/mus/clipboard_mus.h" 24 #include "ui/views/mus/clipboard_mus.h"
25 #include "ui/views/mus/native_widget_mus.h" 25 #include "ui/views/mus/native_widget_mus.h"
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 std::copy(roots.begin(), roots.end(), std::back_inserter(windows)); 210 std::copy(roots.begin(), roots.end(), std::back_inserter(windows));
211 return GetWindowFrom(display_origins, windows, point); 211 return GetWindowFrom(display_origins, windows, point);
212 } 212 }
213 213
214 std::unique_ptr<OSExchangeData::Provider> 214 std::unique_ptr<OSExchangeData::Provider>
215 WindowManagerConnection::BuildProvider() { 215 WindowManagerConnection::BuildProvider() {
216 return base::MakeUnique<OSExchangeDataProviderMus>(); 216 return base::MakeUnique<OSExchangeDataProviderMus>();
217 } 217 }
218 218
219 } // namespace views 219 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/mus/window_manager_connection.h ('k') | ui/views/mus/window_tree_host_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698