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

Side by Side Diff: ash/mus/sysui_application.h

Issue 1878893002: Move //mojo/services tracing & catalog to //services (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@63move
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 | « ash/mus/DEPS ('k') | build/all.gyp » ('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 ASH_MUS_SYSUI_APPLICATION_H_ 5 #ifndef ASH_MUS_SYSUI_APPLICATION_H_
6 #define ASH_MUS_SYSUI_APPLICATION_H_ 6 #define ASH_MUS_SYSUI_APPLICATION_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "mash/shelf/public/interfaces/shelf.mojom.h" 11 #include "mash/shelf/public/interfaces/shelf.mojom.h"
12 #include "mojo/public/cpp/bindings/binding_set.h" 12 #include "mojo/public/cpp/bindings/binding_set.h"
13 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
14 #include "services/shell/public/cpp/shell_client.h" 13 #include "services/shell/public/cpp/shell_client.h"
14 #include "services/tracing/public/cpp/tracing_impl.h"
15 15
16 namespace ash { 16 namespace ash {
17 namespace sysui { 17 namespace sysui {
18 18
19 class AshInit; 19 class AshInit;
20 20
21 class SysUIApplication 21 class SysUIApplication
22 : public mojo::ShellClient, 22 : public mojo::ShellClient,
23 public mojo::InterfaceFactory<mash::shelf::mojom::ShelfController> { 23 public mojo::InterfaceFactory<mash::shelf::mojom::ShelfController> {
24 public: 24 public:
(...skipping 18 matching lines...) Expand all
43 mojo::BindingSet<mash::shelf::mojom::ShelfController> 43 mojo::BindingSet<mash::shelf::mojom::ShelfController>
44 shelf_controller_bindings_; 44 shelf_controller_bindings_;
45 45
46 DISALLOW_COPY_AND_ASSIGN(SysUIApplication); 46 DISALLOW_COPY_AND_ASSIGN(SysUIApplication);
47 }; 47 };
48 48
49 } // namespace sysui 49 } // namespace sysui
50 } // namespace ash 50 } // namespace ash
51 51
52 #endif // ASH_MUS_SYSUI_APPLICATION_H_ 52 #endif // ASH_MUS_SYSUI_APPLICATION_H_
OLDNEW
« no previous file with comments | « ash/mus/DEPS ('k') | build/all.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698