OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "mojo/services/test_service/test_service_application.h" | 5 #include "mojo/services/test_service/test_service_application.h" |
6 | 6 |
7 #include <assert.h> | 7 #include <assert.h> |
| 8 #include <utility> |
8 | 9 |
9 #include "mojo/application/public/cpp/application_connection.h" | 10 #include "mojo/application/public/cpp/application_connection.h" |
10 #include "mojo/application/public/cpp/application_runner.h" | 11 #include "mojo/application/public/cpp/application_runner.h" |
11 #include "mojo/public/c/system/main.h" | 12 #include "mojo/public/c/system/main.h" |
12 #include "mojo/services/test_service/test_service_impl.h" | 13 #include "mojo/services/test_service/test_service_impl.h" |
13 #include "mojo/services/test_service/test_time_service_impl.h" | 14 #include "mojo/services/test_service/test_time_service_impl.h" |
14 | 15 |
15 namespace mojo { | 16 namespace mojo { |
16 namespace test { | 17 namespace test { |
17 | 18 |
(...skipping 10 matching lines...) Expand all Loading... |
28 | 29 |
29 bool TestServiceApplication::ConfigureIncomingConnection( | 30 bool TestServiceApplication::ConfigureIncomingConnection( |
30 ApplicationConnection* connection) { | 31 ApplicationConnection* connection) { |
31 connection->AddService<TestService>(this); | 32 connection->AddService<TestService>(this); |
32 connection->AddService<TestTimeService>(this); | 33 connection->AddService<TestTimeService>(this); |
33 return true; | 34 return true; |
34 } | 35 } |
35 | 36 |
36 void TestServiceApplication::Create(ApplicationConnection* connection, | 37 void TestServiceApplication::Create(ApplicationConnection* connection, |
37 InterfaceRequest<TestService> request) { | 38 InterfaceRequest<TestService> request) { |
38 new TestServiceImpl(app_impl_, this, request.Pass()); | 39 new TestServiceImpl(app_impl_, this, std::move(request)); |
39 AddRef(); | 40 AddRef(); |
40 } | 41 } |
41 | 42 |
42 void TestServiceApplication::Create(ApplicationConnection* connection, | 43 void TestServiceApplication::Create(ApplicationConnection* connection, |
43 InterfaceRequest<TestTimeService> request) { | 44 InterfaceRequest<TestTimeService> request) { |
44 new TestTimeServiceImpl(app_impl_, request.Pass()); | 45 new TestTimeServiceImpl(app_impl_, std::move(request)); |
45 } | 46 } |
46 | 47 |
47 void TestServiceApplication::AddRef() { | 48 void TestServiceApplication::AddRef() { |
48 assert(ref_count_ >= 0); | 49 assert(ref_count_ >= 0); |
49 ref_count_++; | 50 ref_count_++; |
50 } | 51 } |
51 | 52 |
52 void TestServiceApplication::ReleaseRef() { | 53 void TestServiceApplication::ReleaseRef() { |
53 assert(ref_count_ > 0); | 54 assert(ref_count_ > 0); |
54 ref_count_--; | 55 ref_count_--; |
55 if (ref_count_ <= 0) | 56 if (ref_count_ <= 0) |
56 base::MessageLoop::current()->QuitWhenIdle(); | 57 base::MessageLoop::current()->QuitWhenIdle(); |
57 } | 58 } |
58 | 59 |
59 } // namespace test | 60 } // namespace test |
60 } // namespace mojo | 61 } // namespace mojo |
61 | 62 |
62 MojoResult MojoMain(MojoHandle shell_handle) { | 63 MojoResult MojoMain(MojoHandle shell_handle) { |
63 mojo::ApplicationRunner runner(new mojo::test::TestServiceApplication); | 64 mojo::ApplicationRunner runner(new mojo::test::TestServiceApplication); |
64 return runner.Run(shell_handle); | 65 return runner.Run(shell_handle); |
65 } | 66 } |
OLD | NEW |