| OLD | NEW |
| 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 #include <cstdlib> | 5 #include <cstdlib> |
| 6 | 6 |
| 7 #include "mojo/common/weak_binding_set.h" | 7 #include "mojo/common/binding_set.h" |
| 8 #include "mojo/public/c/system/main.h" | 8 #include "mojo/public/c/system/main.h" |
| 9 #include "mojo/public/cpp/application/application_connection.h" | 9 #include "mojo/public/cpp/application/application_connection.h" |
| 10 #include "mojo/public/cpp/application/application_delegate.h" | 10 #include "mojo/public/cpp/application/application_delegate.h" |
| 11 #include "mojo/public/cpp/application/application_runner.h" | 11 #include "mojo/public/cpp/application/application_runner.h" |
| 12 #include "mojo/public/cpp/application/interface_factory.h" | 12 #include "mojo/public/cpp/application/interface_factory.h" |
| 13 #include "mojo/services/device_info/public/interfaces/device_info.mojom.h" | 13 #include "mojo/services/device_info/public/interfaces/device_info.mojom.h" |
| 14 | 14 |
| 15 namespace mojo { | 15 namespace mojo { |
| 16 namespace services { | 16 namespace services { |
| 17 namespace device_info { | 17 namespace device_info { |
| (...skipping 18 matching lines...) Expand all Loading... |
| 36 return true; | 36 return true; |
| 37 } | 37 } |
| 38 | 38 |
| 39 // |InterfaceFactory<DeviceInfo>| implementation. | 39 // |InterfaceFactory<DeviceInfo>| implementation. |
| 40 void Create(mojo::ApplicationConnection* connection, | 40 void Create(mojo::ApplicationConnection* connection, |
| 41 mojo::InterfaceRequest<mojo::DeviceInfo> request) override { | 41 mojo::InterfaceRequest<mojo::DeviceInfo> request) override { |
| 42 binding_.AddBinding(this, request.Pass()); | 42 binding_.AddBinding(this, request.Pass()); |
| 43 } | 43 } |
| 44 | 44 |
| 45 private: | 45 private: |
| 46 mojo::WeakBindingSet<mojo::DeviceInfo> binding_; | 46 mojo::BindingSet<mojo::DeviceInfo> binding_; |
| 47 }; | 47 }; |
| 48 | 48 |
| 49 } // namespace device_info | 49 } // namespace device_info |
| 50 } // namespace services | 50 } // namespace services |
| 51 } // namespace mojo | 51 } // namespace mojo |
| 52 | 52 |
| 53 MojoResult MojoMain(MojoHandle application_request) { | 53 MojoResult MojoMain(MojoHandle application_request) { |
| 54 mojo::ApplicationRunner runner(new mojo::services::device_info::DeviceInfo()); | 54 mojo::ApplicationRunner runner(new mojo::services::device_info::DeviceInfo()); |
| 55 return runner.Run(application_request); | 55 return runner.Run(application_request); |
| 56 } | 56 } |
| OLD | NEW |