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

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

Issue 2026623002: views/mus: Have explicit ownership of views::WindowManagerConnection. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
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_CATALOG_VIEWER_CATALOG_VIEWER_H_ 5 #ifndef MASH_CATALOG_VIEWER_CATALOG_VIEWER_H_
6 #define MASH_CATALOG_VIEWER_CATALOG_VIEWER_H_ 6 #define MASH_CATALOG_VIEWER_CATALOG_VIEWER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 10
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "mash/public/interfaces/launchable.mojom.h" 13 #include "mash/public/interfaces/launchable.mojom.h"
14 #include "mojo/public/cpp/bindings/binding_set.h" 14 #include "mojo/public/cpp/bindings/binding_set.h"
15 #include "services/shell/public/cpp/shell_client.h" 15 #include "services/shell/public/cpp/shell_client.h"
16 #include "services/tracing/public/cpp/tracing_impl.h" 16 #include "services/tracing/public/cpp/tracing_impl.h"
17 17
18 namespace views { 18 namespace views {
19 class AuraInit; 19 class AuraInit;
20 class Widget; 20 class Widget;
21 class WindowManagerConnection;
21 } 22 }
22 23
23 namespace mash { 24 namespace mash {
24 namespace catalog_viewer { 25 namespace catalog_viewer {
25 26
26 class CatalogViewer : public shell::ShellClient, 27 class CatalogViewer : public shell::ShellClient,
27 public mojom::Launchable, 28 public mojom::Launchable,
28 public shell::InterfaceFactory<mojom::Launchable> { 29 public shell::InterfaceFactory<mojom::Launchable> {
29 public: 30 public:
30 CatalogViewer(); 31 CatalogViewer();
(...skipping 15 matching lines...) Expand all
46 void Create(shell::Connection* connection, 47 void Create(shell::Connection* connection,
47 mojom::LaunchableRequest request) override; 48 mojom::LaunchableRequest request) override;
48 49
49 50
50 shell::Connector* connector_ = nullptr; 51 shell::Connector* connector_ = nullptr;
51 mojo::BindingSet<mojom::Launchable> bindings_; 52 mojo::BindingSet<mojom::Launchable> bindings_;
52 std::vector<views::Widget*> windows_; 53 std::vector<views::Widget*> windows_;
53 54
54 mojo::TracingImpl tracing_; 55 mojo::TracingImpl tracing_;
55 std::unique_ptr<views::AuraInit> aura_init_; 56 std::unique_ptr<views::AuraInit> aura_init_;
57 std::unique_ptr<views::WindowManagerConnection> views_mus_;
sky 2016/05/31 18:57:24 ditto
56 58
57 DISALLOW_COPY_AND_ASSIGN(CatalogViewer); 59 DISALLOW_COPY_AND_ASSIGN(CatalogViewer);
58 }; 60 };
59 61
60 } // namespace catalog_viewer 62 } // namespace catalog_viewer
61 } // namespace mash 63 } // namespace mash
62 64
63 #endif // MASH_CATALOG_VIEWER_CATALOG_VIEWER_H_ 65 #endif // MASH_CATALOG_VIEWER_CATALOG_VIEWER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698