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

Side by Side Diff: ui/views/mus/window_tree_host_mus.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/window_manager_connection.cc ('k') | no next file » | 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_TREE_HOST_MUS_H_ 5 #ifndef UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_H_
6 #define UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_H_ 6 #define UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "services/shell/public/cpp/connector.h" 9 #include "services/service_manager/public/cpp/connector.h"
10 #include "ui/aura/window_tree_host_platform.h" 10 #include "ui/aura/window_tree_host_platform.h"
11 #include "ui/views/mus/mus_export.h" 11 #include "ui/views/mus/mus_export.h"
12 12
13 class SkBitmap; 13 class SkBitmap;
14 14
15 namespace ui { 15 namespace ui {
16 class Window; 16 class Window;
17 } 17 }
18 18
19 namespace shell { 19 namespace shell {
(...skipping 24 matching lines...) Expand all
44 44
45 NativeWidgetMus* native_widget_; 45 NativeWidgetMus* native_widget_;
46 std::unique_ptr<InputMethodMus> input_method_; 46 std::unique_ptr<InputMethodMus> input_method_;
47 47
48 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus); 48 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostMus);
49 }; 49 };
50 50
51 } // namespace views 51 } // namespace views
52 52
53 #endif // UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_H_ 53 #endif // UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_H_
OLDNEW
« no previous file with comments | « ui/views/mus/window_manager_connection.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698