| 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/common/binding_set.h" | 5 #include "mojo/common/binding_set.h" |
| 6 #include "mojo/environment/scoped_chromium_init.h" |
| 6 #include "mojo/public/c/system/main.h" | 7 #include "mojo/public/c/system/main.h" |
| 7 #include "mojo/public/cpp/application/application_impl_base.h" | 8 #include "mojo/public/cpp/application/application_impl_base.h" |
| 8 #include "mojo/public/cpp/application/connect.h" | 9 #include "mojo/public/cpp/application/connect.h" |
| 9 #include "mojo/public/cpp/application/run_application.h" | 10 #include "mojo/public/cpp/application/run_application.h" |
| 10 #include "mojo/public/cpp/application/service_provider_impl.h" | 11 #include "mojo/public/cpp/application/service_provider_impl.h" |
| 11 #include "mojo/public/cpp/bindings/strong_binding.h" | 12 #include "mojo/public/cpp/bindings/strong_binding.h" |
| 12 #include "mojo/public/cpp/system/macros.h" | 13 #include "mojo/public/cpp/system/macros.h" |
| 13 #include "mojo/services/authentication/interfaces/authentication.mojom.h" | 14 #include "mojo/services/authentication/interfaces/authentication.mojom.h" |
| 14 #include "mojo/services/network/interfaces/network_service.mojom.h" | 15 #include "mojo/services/network/interfaces/network_service.mojom.h" |
| 15 #include "services/authentication/google_authentication_impl.h" | 16 #include "services/authentication/google_authentication_impl.h" |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 private: | 50 private: |
| 50 mojo::NetworkServicePtr network_service_; | 51 mojo::NetworkServicePtr network_service_; |
| 51 mojo::files::FilesPtr files_; | 52 mojo::files::FilesPtr files_; |
| 52 | 53 |
| 53 DISALLOW_COPY_AND_ASSIGN(GoogleAccountManagerApp); | 54 DISALLOW_COPY_AND_ASSIGN(GoogleAccountManagerApp); |
| 54 }; | 55 }; |
| 55 | 56 |
| 56 } // namespace authentication | 57 } // namespace authentication |
| 57 | 58 |
| 58 MojoResult MojoMain(MojoHandle application_request) { | 59 MojoResult MojoMain(MojoHandle application_request) { |
| 60 mojo::ScopedChromiumInit init; |
| 59 authentication::GoogleAccountManagerApp google_account_manager_app; | 61 authentication::GoogleAccountManagerApp google_account_manager_app; |
| 60 return mojo::RunMainApplication(application_request, | 62 return mojo::RunApplication(application_request, &google_account_manager_app); |
| 61 &google_account_manager_app); | |
| 62 } | 63 } |
| OLD | NEW |