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

Side by Side Diff: mash/quick_launch/quick_launch.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 | « mash/quick_launch/quick_launch.h ('k') | mash/screenlock/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 "mash/quick_launch/quick_launch.h" 5 #include "mash/quick_launch/quick_launch.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/strings/string16.h" 9 #include "base/strings/string16.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
11 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "mash/public/interfaces/launchable.mojom.h" 12 #include "mash/public/interfaces/launchable.mojom.h"
13 #include "services/catalog/public/interfaces/catalog.mojom.h" 13 #include "services/catalog/public/interfaces/catalog.mojom.h"
14 #include "services/shell/public/c/main.h" 14 #include "services/service_manager/public/c/main.h"
15 #include "services/shell/public/cpp/connector.h" 15 #include "services/service_manager/public/cpp/connector.h"
16 #include "services/shell/public/cpp/service.h" 16 #include "services/service_manager/public/cpp/service.h"
17 #include "services/shell/public/cpp/service_runner.h" 17 #include "services/service_manager/public/cpp/service_runner.h"
18 #include "services/tracing/public/cpp/provider.h" 18 #include "services/tracing/public/cpp/provider.h"
19 #include "ui/views/background.h" 19 #include "ui/views/background.h"
20 #include "ui/views/controls/textfield/textfield.h" 20 #include "ui/views/controls/textfield/textfield.h"
21 #include "ui/views/controls/textfield/textfield_controller.h" 21 #include "ui/views/controls/textfield/textfield_controller.h"
22 #include "ui/views/mus/aura_init.h" 22 #include "ui/views/mus/aura_init.h"
23 #include "ui/views/mus/window_manager_connection.h" 23 #include "ui/views/mus/window_manager_connection.h"
24 #include "ui/views/widget/widget_delegate.h" 24 #include "ui/views/widget/widget_delegate.h"
25 #include "url/gurl.h" 25 #include "url/gurl.h"
26 26
27 namespace views { 27 namespace views {
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 windows_.push_back(window); 196 windows_.push_back(window);
197 } 197 }
198 198
199 void QuickLaunch::Create(const shell::Identity& remote_identity, 199 void QuickLaunch::Create(const shell::Identity& remote_identity,
200 mojom::LaunchableRequest request) { 200 mojom::LaunchableRequest request) {
201 bindings_.AddBinding(this, std::move(request)); 201 bindings_.AddBinding(this, std::move(request));
202 } 202 }
203 203
204 } // namespace quick_launch 204 } // namespace quick_launch
205 } // namespace mash 205 } // namespace mash
OLDNEW
« no previous file with comments | « mash/quick_launch/quick_launch.h ('k') | mash/screenlock/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698