| 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 #include <utility> |
| 9 | 9 |
| 10 #include "mojo/public/c/system/main.h" | 10 #include "mojo/public/c/system/main.h" |
| 11 #include "mojo/services/test_service/test_service_impl.h" | 11 #include "mojo/services/test_service/test_service_impl.h" |
| 12 #include "mojo/services/test_service/test_time_service_impl.h" | 12 #include "mojo/services/test_service/test_time_service_impl.h" |
| 13 #include "mojo/shell/public/cpp/application_connection.h" | |
| 14 #include "mojo/shell/public/cpp/application_runner.h" | 13 #include "mojo/shell/public/cpp/application_runner.h" |
| 14 #include "mojo/shell/public/cpp/connection.h" |
| 15 | 15 |
| 16 namespace mojo { | 16 namespace mojo { |
| 17 namespace test { | 17 namespace test { |
| 18 | 18 |
| 19 TestServiceApplication::TestServiceApplication() | 19 TestServiceApplication::TestServiceApplication() |
| 20 : ref_count_(0), shell_(nullptr) { | 20 : ref_count_(0), shell_(nullptr) { |
| 21 } | 21 } |
| 22 | 22 |
| 23 TestServiceApplication::~TestServiceApplication() { | 23 TestServiceApplication::~TestServiceApplication() { |
| 24 } | 24 } |
| 25 | 25 |
| 26 void TestServiceApplication::Initialize(Shell* shell, const std::string& url, | 26 void TestServiceApplication::Initialize(Shell* shell, const std::string& url, |
| 27 uint32_t id) { | 27 uint32_t id) { |
| 28 shell_ = shell; | 28 shell_ = shell; |
| 29 } | 29 } |
| 30 | 30 |
| 31 bool TestServiceApplication::AcceptConnection( | 31 bool TestServiceApplication::AcceptConnection(Connection* connection) { |
| 32 ApplicationConnection* connection) { | |
| 33 connection->AddService<TestService>(this); | 32 connection->AddService<TestService>(this); |
| 34 connection->AddService<TestTimeService>(this); | 33 connection->AddService<TestTimeService>(this); |
| 35 return true; | 34 return true; |
| 36 } | 35 } |
| 37 | 36 |
| 38 void TestServiceApplication::Create(ApplicationConnection* connection, | 37 void TestServiceApplication::Create(Connection* connection, |
| 39 InterfaceRequest<TestService> request) { | 38 InterfaceRequest<TestService> request) { |
| 40 new TestServiceImpl(shell_, this, std::move(request)); | 39 new TestServiceImpl(shell_, this, std::move(request)); |
| 41 AddRef(); | 40 AddRef(); |
| 42 } | 41 } |
| 43 | 42 |
| 44 void TestServiceApplication::Create(ApplicationConnection* connection, | 43 void TestServiceApplication::Create(Connection* connection, |
| 45 InterfaceRequest<TestTimeService> request) { | 44 InterfaceRequest<TestTimeService> request) { |
| 46 new TestTimeServiceImpl(shell_, std::move(request)); | 45 new TestTimeServiceImpl(shell_, std::move(request)); |
| 47 } | 46 } |
| 48 | 47 |
| 49 void TestServiceApplication::AddRef() { | 48 void TestServiceApplication::AddRef() { |
| 50 assert(ref_count_ >= 0); | 49 assert(ref_count_ >= 0); |
| 51 ref_count_++; | 50 ref_count_++; |
| 52 } | 51 } |
| 53 | 52 |
| 54 void TestServiceApplication::ReleaseRef() { | 53 void TestServiceApplication::ReleaseRef() { |
| 55 assert(ref_count_ > 0); | 54 assert(ref_count_ > 0); |
| 56 ref_count_--; | 55 ref_count_--; |
| 57 if (ref_count_ <= 0) | 56 if (ref_count_ <= 0) |
| 58 base::MessageLoop::current()->QuitWhenIdle(); | 57 base::MessageLoop::current()->QuitWhenIdle(); |
| 59 } | 58 } |
| 60 | 59 |
| 61 } // namespace test | 60 } // namespace test |
| 62 } // namespace mojo | 61 } // namespace mojo |
| 63 | 62 |
| 64 MojoResult MojoMain(MojoHandle shell_handle) { | 63 MojoResult MojoMain(MojoHandle shell_handle) { |
| 65 mojo::ApplicationRunner runner(new mojo::test::TestServiceApplication); | 64 mojo::ApplicationRunner runner(new mojo::test::TestServiceApplication); |
| 66 return runner.Run(shell_handle); | 65 return runner.Run(shell_handle); |
| 67 } | 66 } |
| OLD | NEW |