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

Side by Side Diff: mash/app_driver/app_driver.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 | « mash/app_driver/BUILD.gn ('k') | mash/app_driver/app_driver.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 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 MASH_APP_DRIVER_APP_DRIVER_H_ 5 #ifndef MASH_APP_DRIVER_APP_DRIVER_H_
6 #define MASH_APP_DRIVER_APP_DRIVER_H_ 6 #define MASH_APP_DRIVER_APP_DRIVER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
11 11
12 #include "base/callback.h" 12 #include "base/callback.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "mojo/public/cpp/bindings/binding.h" 15 #include "mojo/public/cpp/bindings/binding.h"
16 #include "services/catalog/public/interfaces/catalog.mojom.h" 16 #include "services/catalog/public/interfaces/catalog.mojom.h"
17 #include "services/shell/public/cpp/service.h" 17 #include "services/service_manager/public/cpp/service.h"
18 #include "services/ui/public/interfaces/accelerator_registrar.mojom.h" 18 #include "services/ui/public/interfaces/accelerator_registrar.mojom.h"
19 19
20 namespace mash { 20 namespace mash {
21 namespace app_driver { 21 namespace app_driver {
22 22
23 class AppDriver : public shell::Service, 23 class AppDriver : public shell::Service,
24 public ui::mojom::AcceleratorHandler { 24 public ui::mojom::AcceleratorHandler {
25 public: 25 public:
26 AppDriver(); 26 AppDriver();
27 ~AppDriver() override; 27 ~AppDriver() override;
(...skipping 16 matching lines...) Expand all
44 mojo::Binding<ui::mojom::AcceleratorHandler> binding_; 44 mojo::Binding<ui::mojom::AcceleratorHandler> binding_;
45 base::WeakPtrFactory<AppDriver> weak_factory_; 45 base::WeakPtrFactory<AppDriver> weak_factory_;
46 46
47 DISALLOW_COPY_AND_ASSIGN(AppDriver); 47 DISALLOW_COPY_AND_ASSIGN(AppDriver);
48 }; 48 };
49 49
50 } // namespace app_driver 50 } // namespace app_driver
51 } // namespace mash 51 } // namespace mash
52 52
53 #endif // MASH_APP_DRIVER_APP_DRIVER_H_ 53 #endif // MASH_APP_DRIVER_APP_DRIVER_H_
OLDNEW
« no previous file with comments | « mash/app_driver/BUILD.gn ('k') | mash/app_driver/app_driver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698