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

Side by Side Diff: mash/browser/browser.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 | « ios/web/webui/web_ui_mojo_inttest.mm ('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"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 // shell::Service: 45 // shell::Service:
46 void OnStart(shell::Connector* connector, 46 void OnStart(shell::Connector* connector,
47 const shell::Identity& identity, 47 const shell::Identity& identity,
48 uint32_t id) override; 48 uint32_t id) override;
49 bool OnConnect(shell::Connection* connection) override; 49 bool OnConnect(shell::Connection* connection) override;
50 50
51 // mojom::Launchable: 51 // mojom::Launchable:
52 void Launch(uint32_t what, mojom::LaunchMode how) override; 52 void Launch(uint32_t what, mojom::LaunchMode how) override;
53 53
54 // shell::InterfaceFactory<mojom::Launchable>: 54 // shell::InterfaceFactory<mojom::Launchable>:
55 void Create(shell::Connection* connection, 55 void Create(const shell::Identity& remote_identity,
56 mojom::LaunchableRequest request) override; 56 mojom::LaunchableRequest request) override;
57 57
58 shell::Connector* connector_ = nullptr; 58 shell::Connector* connector_ = nullptr;
59 mojo::BindingSet<mojom::Launchable> bindings_; 59 mojo::BindingSet<mojom::Launchable> bindings_;
60 std::vector<views::Widget*> windows_; 60 std::vector<views::Widget*> windows_;
61 61
62 mojo::TracingImpl tracing_; 62 mojo::TracingImpl tracing_;
63 std::unique_ptr<views::AuraInit> aura_init_; 63 std::unique_ptr<views::AuraInit> aura_init_;
64 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_; 64 std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
65 65
66 DISALLOW_COPY_AND_ASSIGN(Browser); 66 DISALLOW_COPY_AND_ASSIGN(Browser);
67 }; 67 };
68 68
69 } // namespace browser 69 } // namespace browser
70 } // namespace mash 70 } // namespace mash
71 71
72 #endif // MASH_BROWSER_BROWSER_H_ 72 #endif // MASH_BROWSER_BROWSER_H_
OLDNEW
« no previous file with comments | « ios/web/webui/web_ui_mojo_inttest.mm ('k') | mash/browser/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698