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

Side by Side Diff: ash/touch_hud/mus/touch_hud_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/touch_hud/mus/touch_hud_application.h ('k') | blimp/client/app/BUILD.gn » ('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/touch_hud/mus/touch_hud_application.h" 5 #include "ash/touch_hud/mus/touch_hud_application.h"
6 6
7 #include "ash/public/interfaces/container.mojom.h" 7 #include "ash/public/interfaces/container.mojom.h"
8 #include "ash/touch_hud/touch_hud_renderer.h" 8 #include "ash/touch_hud/touch_hud_renderer.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "services/shell/public/cpp/connector.h" 11 #include "services/service_manager/public/cpp/connector.h"
12 #include "services/ui/public/cpp/property_type_converters.h" 12 #include "services/ui/public/cpp/property_type_converters.h"
13 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" 13 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
14 #include "ui/views/mus/aura_init.h" 14 #include "ui/views/mus/aura_init.h"
15 #include "ui/views/mus/native_widget_mus.h" 15 #include "ui/views/mus/native_widget_mus.h"
16 #include "ui/views/mus/pointer_watcher_event_router.h" 16 #include "ui/views/mus/pointer_watcher_event_router.h"
17 #include "ui/views/mus/window_manager_connection.h" 17 #include "ui/views/mus/window_manager_connection.h"
18 #include "ui/views/pointer_watcher.h" 18 #include "ui/views/pointer_watcher.h"
19 #include "ui/views/widget/widget.h" 19 #include "ui/views/widget/widget.h"
20 #include "ui/views/widget/widget_delegate.h" 20 #include "ui/views/widget/widget_delegate.h"
21 21
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 } 106 }
107 107
108 void TouchHudApplication::Create(const shell::Identity& remote_identity, 108 void TouchHudApplication::Create(const shell::Identity& remote_identity,
109 mash::mojom::LaunchableRequest request) { 109 mash::mojom::LaunchableRequest request) {
110 binding_.Close(); 110 binding_.Close();
111 binding_.Bind(std::move(request)); 111 binding_.Bind(std::move(request));
112 } 112 }
113 113
114 } // namespace touch_hud 114 } // namespace touch_hud
115 } // namespace ash 115 } // namespace ash
OLDNEW
« no previous file with comments | « ash/touch_hud/mus/touch_hud_application.h ('k') | blimp/client/app/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698