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

Side by Side Diff: mash/quick_launch/quick_launch_application.h

Issue 1877753003: Move mojo\shell to services\shell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@62scan
Patch Set: . Created 4 years, 8 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/main.cc ('k') | mash/quick_launch/quick_launch_application.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 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 #ifndef MASH_QUICK_LAUNCH_QUICK_LAUNCH_APPLICATION_H_ 5 #ifndef MASH_QUICK_LAUNCH_QUICK_LAUNCH_APPLICATION_H_
6 #define MASH_QUICK_LAUNCH_QUICK_LAUNCH_APPLICATION_H_ 6 #define MASH_QUICK_LAUNCH_QUICK_LAUNCH_APPLICATION_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "mojo/services/catalog/public/interfaces/catalog.mojom.h" 11 #include "mojo/services/catalog/public/interfaces/catalog.mojom.h"
12 #include "mojo/services/tracing/public/cpp/tracing_impl.h" 12 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
13 #include "mojo/shell/public/cpp/shell_client.h" 13 #include "services/shell/public/cpp/shell_client.h"
14 14
15 namespace views { 15 namespace views {
16 class AuraInit; 16 class AuraInit;
17 } 17 }
18 18
19 namespace mash { 19 namespace mash {
20 namespace quick_launch { 20 namespace quick_launch {
21 21
22 class QuickLaunchApplication : public mojo::ShellClient { 22 class QuickLaunchApplication : public mojo::ShellClient {
23 public: 23 public:
(...skipping 10 matching lines...) Expand all
34 mojo::TracingImpl tracing_; 34 mojo::TracingImpl tracing_;
35 std::unique_ptr<views::AuraInit> aura_init_; 35 std::unique_ptr<views::AuraInit> aura_init_;
36 36
37 DISALLOW_COPY_AND_ASSIGN(QuickLaunchApplication); 37 DISALLOW_COPY_AND_ASSIGN(QuickLaunchApplication);
38 }; 38 };
39 39
40 } // namespace quick_launch 40 } // namespace quick_launch
41 } // namespace mash 41 } // namespace mash
42 42
43 #endif // MASH_QUICK_LAUNCH_QUICK_LAUNCH_APPLICATION_H_ 43 #endif // MASH_QUICK_LAUNCH_QUICK_LAUNCH_APPLICATION_H_
OLDNEW
« no previous file with comments | « mash/quick_launch/main.cc ('k') | mash/quick_launch/quick_launch_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698