OLD | NEW |
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 #include "mash/catalog_viewer/catalog_viewer.h" | 5 #include "mash/catalog_viewer/catalog_viewer.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
212 | 212 |
213 void CatalogViewer::RemoveWindow(views::Widget* window) { | 213 void CatalogViewer::RemoveWindow(views::Widget* window) { |
214 auto it = std::find(windows_.begin(), windows_.end(), window); | 214 auto it = std::find(windows_.begin(), windows_.end(), window); |
215 DCHECK(it != windows_.end()); | 215 DCHECK(it != windows_.end()); |
216 windows_.erase(it); | 216 windows_.erase(it); |
217 if (windows_.empty()) | 217 if (windows_.empty()) |
218 base::MessageLoop::current()->QuitWhenIdle(); | 218 base::MessageLoop::current()->QuitWhenIdle(); |
219 } | 219 } |
220 | 220 |
221 void CatalogViewer::OnStart() { | 221 void CatalogViewer::OnStart() { |
222 tracing_.Initialize(context()->connector(), context()->identity().name()); | |
223 | |
224 aura_init_ = base::MakeUnique<views::AuraInit>( | 222 aura_init_ = base::MakeUnique<views::AuraInit>( |
225 context()->connector(), context()->identity(), "views_mus_resources.pak", | 223 context()->connector(), context()->identity(), "views_mus_resources.pak", |
226 std::string(), nullptr, views::AuraInit::Mode::AURA_MUS); | 224 std::string(), nullptr, views::AuraInit::Mode::AURA_MUS); |
227 } | 225 } |
228 | 226 |
229 void CatalogViewer::OnBindInterface( | 227 void CatalogViewer::OnBindInterface( |
230 const service_manager::ServiceInfo& source_info, | 228 const service_manager::ServiceInfo& source_info, |
231 const std::string& interface_name, | 229 const std::string& interface_name, |
232 mojo::ScopedMessagePipeHandle interface_pipe) { | 230 mojo::ScopedMessagePipeHandle interface_pipe) { |
233 registry_.BindInterface(source_info.identity, interface_name, | 231 registry_.BindInterface(source_info.identity, interface_name, |
(...skipping 17 matching lines...) Expand all Loading... |
251 windows_.push_back(window); | 249 windows_.push_back(window); |
252 } | 250 } |
253 | 251 |
254 void CatalogViewer::Create(const service_manager::Identity& remote_identity, | 252 void CatalogViewer::Create(const service_manager::Identity& remote_identity, |
255 mojom::LaunchableRequest request) { | 253 mojom::LaunchableRequest request) { |
256 bindings_.AddBinding(this, std::move(request)); | 254 bindings_.AddBinding(this, std::move(request)); |
257 } | 255 } |
258 | 256 |
259 } // namespace catalog_viewer | 257 } // namespace catalog_viewer |
260 } // namespace mash | 258 } // namespace mash |
OLD | NEW |