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

Side by Side Diff: ui/views/mus/window_manager_connection.h

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/views_mus_test_suite.cc ('k') | ui/views/mus/window_manager_connection.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 #ifndef UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ 5 #ifndef UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_
6 #define UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ 6 #define UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
11 #include <memory> 11 #include <memory>
12 #include <set> 12 #include <set>
13 #include <string> 13 #include <string>
14 #include <vector> 14 #include <vector>
15 15
16 #include "base/macros.h" 16 #include "base/macros.h"
17 #include "services/shell/public/cpp/identity.h" 17 #include "services/service_manager/public/cpp/identity.h"
18 #include "services/ui/public/cpp/window_tree_client_delegate.h" 18 #include "services/ui/public/cpp/window_tree_client_delegate.h"
19 #include "ui/base/dragdrop/os_exchange_data_provider_factory.h" 19 #include "ui/base/dragdrop/os_exchange_data_provider_factory.h"
20 #include "ui/views/mus/mus_export.h" 20 #include "ui/views/mus/mus_export.h"
21 #include "ui/views/mus/screen_mus_delegate.h" 21 #include "ui/views/mus/screen_mus_delegate.h"
22 #include "ui/views/widget/widget.h" 22 #include "ui/views/widget/widget.h"
23 23
24 namespace shell { 24 namespace shell {
25 class Connector; 25 class Connector;
26 } 26 }
27 27
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 std::unique_ptr<ui::GpuService> gpu_service_; 116 std::unique_ptr<ui::GpuService> gpu_service_;
117 std::unique_ptr<PointerWatcherEventRouter> pointer_watcher_event_router_; 117 std::unique_ptr<PointerWatcherEventRouter> pointer_watcher_event_router_;
118 std::unique_ptr<SurfaceContextFactory> compositor_context_factory_; 118 std::unique_ptr<SurfaceContextFactory> compositor_context_factory_;
119 119
120 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection); 120 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection);
121 }; 121 };
122 122
123 } // namespace views 123 } // namespace views
124 124
125 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ 125 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_
OLDNEW
« no previous file with comments | « ui/views/mus/views_mus_test_suite.cc ('k') | ui/views/mus/window_manager_connection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698