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

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

Issue 2182643003: Remove shell::Connection* parameter to InterfaceFactory<T>::Create() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 4 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/browser/browser.cc ('k') | mash/catalog_viewer/catalog_viewer.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_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
(...skipping 26 matching lines...) Expand all
37 // shell::Service: 37 // shell::Service:
38 void OnStart(shell::Connector* connector, 38 void OnStart(shell::Connector* connector,
39 const shell::Identity& identity, 39 const shell::Identity& identity,
40 uint32_t id) override; 40 uint32_t id) override;
41 bool OnConnect(shell::Connection* connection) override; 41 bool OnConnect(shell::Connection* connection) override;
42 42
43 // mojom::Launchable: 43 // mojom::Launchable:
44 void Launch(uint32_t what, mojom::LaunchMode how) override; 44 void Launch(uint32_t what, mojom::LaunchMode how) override;
45 45
46 // shell::InterfaceFactory<mojom::Launchable>: 46 // shell::InterfaceFactory<mojom::Launchable>:
47 void Create(shell::Connection* connection, 47 void Create(const shell::Identity& remote_identity,
48 mojom::LaunchableRequest request) override; 48 mojom::LaunchableRequest request) override;
49 49
50 50
51 shell::Connector* connector_ = nullptr; 51 shell::Connector* connector_ = nullptr;
52 mojo::BindingSet<mojom::Launchable> bindings_; 52 mojo::BindingSet<mojom::Launchable> bindings_;
53 std::vector<views::Widget*> windows_; 53 std::vector<views::Widget*> windows_;
54 54
55 mojo::TracingImpl tracing_; 55 mojo::TracingImpl tracing_;
56 std::unique_ptr<views::AuraInit> aura_init_; 56 std::unique_ptr<views::AuraInit> aura_init_;
57 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; 57 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
58 58
59 DISALLOW_COPY_AND_ASSIGN(CatalogViewer); 59 DISALLOW_COPY_AND_ASSIGN(CatalogViewer);
60 }; 60 };
61 61
62 } // namespace catalog_viewer 62 } // namespace catalog_viewer
63 } // namespace mash 63 } // namespace mash
64 64
65 #endif // MASH_CATALOG_VIEWER_CATALOG_VIEWER_H_ 65 #endif // MASH_CATALOG_VIEWER_CATALOG_VIEWER_H_
OLDNEW
« no previous file with comments | « mash/browser/browser.cc ('k') | mash/catalog_viewer/catalog_viewer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698