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

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

Issue 2850743004: Replace ServiceInfo with BindSourceInfo. (Closed)
Patch Set: . Created 3 years, 7 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 | « content/renderer/render_frame_impl.cc ('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 27 matching lines...) Expand all
38 // browser windows, the application terminates. The Browser object does not 38 // browser windows, the application terminates. The Browser object does not
39 // own these widgets. 39 // own these widgets.
40 void AddWindow(views::Widget* window); 40 void AddWindow(views::Widget* window);
41 void RemoveWindow(views::Widget* window); 41 void RemoveWindow(views::Widget* window);
42 42
43 std::unique_ptr<navigation::View> CreateView(); 43 std::unique_ptr<navigation::View> CreateView();
44 44
45 private: 45 private:
46 // service_manager::Service: 46 // service_manager::Service:
47 void OnStart() override; 47 void OnStart() override;
48 void OnBindInterface(const service_manager::ServiceInfo& source_info, 48 void OnBindInterface(const service_manager::BindSourceInfo& source_info,
49 const std::string& interface_name, 49 const std::string& interface_name,
50 mojo::ScopedMessagePipeHandle interface_pipe) override; 50 mojo::ScopedMessagePipeHandle interface_pipe) override;
51 51
52 // mojom::Launchable: 52 // mojom::Launchable:
53 void Launch(uint32_t what, mojom::LaunchMode how) override; 53 void Launch(uint32_t what, mojom::LaunchMode how) override;
54 54
55 // service_manager::InterfaceFactory<mojom::Launchable>: 55 // service_manager::InterfaceFactory<mojom::Launchable>:
56 void Create(const service_manager::Identity& remote_identity, 56 void Create(const service_manager::Identity& remote_identity,
57 mojom::LaunchableRequest request) override; 57 mojom::LaunchableRequest request) override;
58 58
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 service_manager::BinderRegistry registry_; 62 service_manager::BinderRegistry registry_;
63 63
64 tracing::Provider tracing_; 64 tracing::Provider tracing_;
65 std::unique_ptr<views::AuraInit> aura_init_; 65 std::unique_ptr<views::AuraInit> aura_init_;
66 66
67 DISALLOW_COPY_AND_ASSIGN(Browser); 67 DISALLOW_COPY_AND_ASSIGN(Browser);
68 }; 68 };
69 69
70 } // namespace browser 70 } // namespace browser
71 } // namespace mash 71 } // namespace mash
72 72
73 #endif // MASH_BROWSER_BROWSER_H_ 73 #endif // MASH_BROWSER_BROWSER_H_
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | mash/browser/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698