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

Side by Side Diff: mash/browser/browser.h

Issue 2576533003: Converts some services to use aura-mus (Closed)
Patch Set: remove log Created 4 years 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/browser/BUILD.gn ('k') | mash/browser/browser.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_BROWSER_BROWSER_H_ 5 #ifndef MASH_BROWSER_BROWSER_H_
6 #define MASH_BROWSER_BROWSER_H_ 6 #define MASH_BROWSER_BROWSER_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "mash/public/interfaces/launchable.mojom.h" 11 #include "mash/public/interfaces/launchable.mojom.h"
12 #include "mojo/public/cpp/bindings/binding_set.h" 12 #include "mojo/public/cpp/bindings/binding_set.h"
13 #include "services/service_manager/public/cpp/interface_factory.h" 13 #include "services/service_manager/public/cpp/interface_factory.h"
14 #include "services/service_manager/public/cpp/service.h" 14 #include "services/service_manager/public/cpp/service.h"
15 #include "services/tracing/public/cpp/provider.h" 15 #include "services/tracing/public/cpp/provider.h"
16 16
17 namespace navigation { 17 namespace navigation {
18 class View; 18 class View;
19 } 19 }
20 20
21 namespace views { 21 namespace views {
22 class AuraInit; 22 class AuraInit;
23 class Widget; 23 class Widget;
24 class WindowManagerConnection;
25 } 24 }
26 25
27 namespace mash { 26 namespace mash {
28 namespace browser { 27 namespace browser {
29 28
30 class Browser : public service_manager::Service, 29 class Browser : public service_manager::Service,
31 public mojom::Launchable, 30 public mojom::Launchable,
32 public service_manager::InterfaceFactory<mojom::Launchable> { 31 public service_manager::InterfaceFactory<mojom::Launchable> {
33 public: 32 public:
34 Browser(); 33 Browser();
(...skipping 18 matching lines...) Expand all
53 52
54 // service_manager::InterfaceFactory<mojom::Launchable>: 53 // service_manager::InterfaceFactory<mojom::Launchable>:
55 void Create(const service_manager::Identity& remote_identity, 54 void Create(const service_manager::Identity& remote_identity,
56 mojom::LaunchableRequest request) override; 55 mojom::LaunchableRequest request) override;
57 56
58 mojo::BindingSet<mojom::Launchable> bindings_; 57 mojo::BindingSet<mojom::Launchable> bindings_;
59 std::vector<views::Widget*> windows_; 58 std::vector<views::Widget*> windows_;
60 59
61 tracing::Provider tracing_; 60 tracing::Provider tracing_;
62 std::unique_ptr<views::AuraInit> aura_init_; 61 std::unique_ptr<views::AuraInit> aura_init_;
63 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
64 62
65 DISALLOW_COPY_AND_ASSIGN(Browser); 63 DISALLOW_COPY_AND_ASSIGN(Browser);
66 }; 64 };
67 65
68 } // namespace browser 66 } // namespace browser
69 } // namespace mash 67 } // namespace mash
70 68
71 #endif // MASH_BROWSER_BROWSER_H_ 69 #endif // MASH_BROWSER_BROWSER_H_
OLDNEW
« no previous file with comments | « mash/browser/BUILD.gn ('k') | mash/browser/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698