| 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 "mojo/application/application_runner_chromium.h" | 5 #include "mojo/application/application_runner_chromium.h" |
| 6 #include "mojo/common/binding_set.h" | 6 #include "mojo/common/binding_set.h" |
| 7 #include "mojo/public/c/system/main.h" | 7 #include "mojo/public/c/system/main.h" |
| 8 #include "mojo/public/cpp/application/application_connection.h" | 8 #include "mojo/public/cpp/application/application_connection.h" |
| 9 #include "mojo/public/cpp/application/application_delegate.h" | 9 #include "mojo/public/cpp/application/application_delegate.h" |
| 10 #include "mojo/public/cpp/application/application_impl.h" | 10 #include "mojo/public/cpp/application/application_impl.h" |
| 11 #include "mojo/public/cpp/application/interface_factory.h" | 11 #include "mojo/public/cpp/application/interface_factory.h" |
| 12 #include "mojo/public/cpp/bindings/strong_binding.h" | 12 #include "mojo/public/cpp/bindings/strong_binding.h" |
| 13 #include "mojo/public/cpp/system/macros.h" | 13 #include "mojo/public/cpp/system/macros.h" |
| 14 #include "mojo/services/authentication/interfaces/authentication.mojom.h" | 14 #include "mojo/services/authentication/interfaces/authentication.mojom.h" |
| 15 #include "mojo/services/network/interfaces/network_service.mojom.h" | 15 #include "mojo/services/network/interfaces/network_service.mojom.h" |
| 16 #include "services/authentication/google_authentication_impl.h" | 16 #include "services/authentication/google_authentication_impl.h" |
| 17 | 17 |
| 18 namespace authentication { | 18 namespace authentication { |
| 19 | 19 |
| 20 class GoogleAccountManagerApp | 20 class GoogleAccountManagerApp |
| 21 : public mojo::ApplicationDelegate, | 21 : public mojo::ApplicationDelegate, |
| 22 public mojo::InterfaceFactory<AuthenticationService> { | 22 public mojo::InterfaceFactory<AuthenticationService> { |
| 23 public: | 23 public: |
| 24 GoogleAccountManagerApp() {} | 24 GoogleAccountManagerApp() {} |
| 25 ~GoogleAccountManagerApp() override {} | 25 ~GoogleAccountManagerApp() override {} |
| 26 | 26 |
| 27 void Initialize(mojo::ApplicationImpl* app) override { | 27 void Initialize(mojo::ApplicationImpl* app) override { |
| 28 app->ConnectToService("mojo:network_service", &network_service_); | 28 app->ConnectToServiceDeprecated("mojo:network_service", &network_service_); |
| 29 app->ConnectToService("mojo:files", &files_); | 29 app->ConnectToServiceDeprecated("mojo:files", &files_); |
| 30 | 30 |
| 31 app_url_ = app->url(); | 31 app_url_ = app->url(); |
| 32 } | 32 } |
| 33 | 33 |
| 34 bool ConfigureIncomingConnection( | 34 bool ConfigureIncomingConnection( |
| 35 mojo::ApplicationConnection* connection) override { | 35 mojo::ApplicationConnection* connection) override { |
| 36 connection->AddService<AuthenticationService>(this); | 36 connection->AddService<AuthenticationService>(this); |
| 37 return true; | 37 return true; |
| 38 } | 38 } |
| 39 | 39 |
| (...skipping 19 matching lines...) Expand all Loading... |
| 59 DISALLOW_COPY_AND_ASSIGN(GoogleAccountManagerApp); | 59 DISALLOW_COPY_AND_ASSIGN(GoogleAccountManagerApp); |
| 60 }; | 60 }; |
| 61 | 61 |
| 62 } // namespace authentication | 62 } // namespace authentication |
| 63 | 63 |
| 64 MojoResult MojoMain(MojoHandle application_request) { | 64 MojoResult MojoMain(MojoHandle application_request) { |
| 65 mojo::ApplicationRunnerChromium runner( | 65 mojo::ApplicationRunnerChromium runner( |
| 66 new authentication::GoogleAccountManagerApp()); | 66 new authentication::GoogleAccountManagerApp()); |
| 67 return runner.Run(application_request); | 67 return runner.Run(application_request); |
| 68 } | 68 } |
| OLD | NEW |