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

Side by Side Diff: ash/mus/window_manager_application.h

Issue 2107383003: ash/mus: Store the InterfaceRequest<>s directly in the vector. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 | « no previous file | ash/mus/window_manager_application.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ 5 #ifndef ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
6 #define ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ 6 #define ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 shell::Connector* connector_; 99 shell::Connector* connector_;
100 100
101 mojo::TracingImpl tracing_; 101 mojo::TracingImpl tracing_;
102 102
103 std::unique_ptr<views::AuraInit> aura_init_; 103 std::unique_ptr<views::AuraInit> aura_init_;
104 104
105 // The |shelf_layout_| object is created once OnEmbed() is called. Until that 105 // The |shelf_layout_| object is created once OnEmbed() is called. Until that
106 // time |shelf_layout_requests_| stores pending interface requests. 106 // time |shelf_layout_requests_| stores pending interface requests.
107 std::unique_ptr<ShelfLayoutImpl> shelf_layout_; 107 std::unique_ptr<ShelfLayoutImpl> shelf_layout_;
108 mojo::BindingSet<mojom::ShelfLayout> shelf_layout_bindings_; 108 mojo::BindingSet<mojom::ShelfLayout> shelf_layout_bindings_;
109 std::vector<std::unique_ptr<mojo::InterfaceRequest<mojom::ShelfLayout>>> 109 std::vector<mojo::InterfaceRequest<mojom::ShelfLayout>>
110 shelf_layout_requests_; 110 shelf_layout_requests_;
111 111
112 // |user_window_controller_| is created once OnEmbed() is called. Until that 112 // |user_window_controller_| is created once OnEmbed() is called. Until that
113 // time |user_window_controller_requests_| stores pending interface requests. 113 // time |user_window_controller_requests_| stores pending interface requests.
114 std::unique_ptr<UserWindowControllerImpl> user_window_controller_; 114 std::unique_ptr<UserWindowControllerImpl> user_window_controller_;
115 mojo::BindingSet<mojom::UserWindowController> 115 mojo::BindingSet<mojom::UserWindowController>
116 user_window_controller_bindings_; 116 user_window_controller_bindings_;
117 std::vector< 117 std::vector<mojo::InterfaceRequest<mojom::UserWindowController>>
118 std::unique_ptr<mojo::InterfaceRequest<mojom::UserWindowController>>>
119 user_window_controller_requests_; 118 user_window_controller_requests_;
120 119
121 std::unique_ptr<WindowManager> window_manager_; 120 std::unique_ptr<WindowManager> window_manager_;
122 121
123 std::set<AcceleratorRegistrarImpl*> accelerator_registrars_; 122 std::set<AcceleratorRegistrarImpl*> accelerator_registrars_;
124 123
125 mash::session::mojom::SessionPtr session_; 124 mash::session::mojom::SessionPtr session_;
126 125
127 mojo::Binding<mash::session::mojom::ScreenlockStateListener> 126 mojo::Binding<mash::session::mojom::ScreenlockStateListener>
128 screenlock_state_listener_binding_; 127 screenlock_state_listener_binding_;
129 128
130 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); 129 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication);
131 }; 130 };
132 131
133 } // namespace mus 132 } // namespace mus
134 } // namespace ash 133 } // namespace ash
135 134
136 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ 135 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
OLDNEW
« no previous file with comments | « no previous file | ash/mus/window_manager_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698