| 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 "base/memory/scoped_ptr.h" | 5 #include "base/memory/scoped_ptr.h" |
| 6 #include "dbus/bus.h" | 6 #include "dbus/bus.h" |
| 7 #include "dbus/exported_object.h" | 7 #include "dbus/exported_object.h" |
| 8 #include "dbus/message.h" | 8 #include "dbus/message.h" |
| 9 #include "dbus/object_path.h" | 9 #include "dbus/object_path.h" |
| 10 #include "mojo/common/channel_init.h" | 10 #include "mojo/common/channel_init.h" |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 private: | 67 private: |
| 68 class Impl : public InterfaceImpl<ExternalService> { | 68 class Impl : public InterfaceImpl<ExternalService> { |
| 69 public: | 69 public: |
| 70 explicit Impl(DBusExternalService* service) : service_(service) { | 70 explicit Impl(DBusExternalService* service) : service_(service) { |
| 71 } | 71 } |
| 72 virtual void OnConnectionError() OVERRIDE { | 72 virtual void OnConnectionError() OVERRIDE { |
| 73 service_->Disconnect(); | 73 service_->Disconnect(); |
| 74 } | 74 } |
| 75 virtual void Activate(ScopedMessagePipeHandle shell_handle) OVERRIDE { | 75 virtual void Activate(ScopedMessagePipeHandle shell_handle) OVERRIDE { |
| 76 app_.reset(new Application(shell_handle.Pass())); | 76 app_.reset(new Application(shell_handle.Pass())); |
| 77 app_->AddServiceConnector(new ServiceConnector<ServiceImpl>()); | 77 app_->AddService<ServiceImpl>(); |
| 78 } | 78 } |
| 79 private: | 79 private: |
| 80 DBusExternalService* service_; | 80 DBusExternalService* service_; |
| 81 scoped_ptr<Application> app_; | 81 scoped_ptr<Application> app_; |
| 82 }; | 82 }; |
| 83 | 83 |
| 84 scoped_ptr<Impl> external_service_; | 84 scoped_ptr<Impl> external_service_; |
| 85 }; | 85 }; |
| 86 | 86 |
| 87 } // namespace mojo | 87 } // namespace mojo |
| OLD | NEW |