Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: services/authentication/main.cc

Issue 1915403002: ApplicationImpl::ConnectToServiceDeprecated() -> mojo::ConnectToService() conversion, part 2. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: doh Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/connect.h"
11 #include "mojo/public/cpp/application/interface_factory.h" 12 #include "mojo/public/cpp/application/interface_factory.h"
12 #include "mojo/public/cpp/bindings/strong_binding.h" 13 #include "mojo/public/cpp/bindings/strong_binding.h"
13 #include "mojo/public/cpp/system/macros.h" 14 #include "mojo/public/cpp/system/macros.h"
14 #include "mojo/services/authentication/interfaces/authentication.mojom.h" 15 #include "mojo/services/authentication/interfaces/authentication.mojom.h"
15 #include "mojo/services/network/interfaces/network_service.mojom.h" 16 #include "mojo/services/network/interfaces/network_service.mojom.h"
16 #include "services/authentication/google_authentication_impl.h" 17 #include "services/authentication/google_authentication_impl.h"
17 18
18 namespace authentication { 19 namespace authentication {
19 20
20 class GoogleAccountManagerApp 21 class GoogleAccountManagerApp
21 : public mojo::ApplicationDelegate, 22 : public mojo::ApplicationDelegate,
22 public mojo::InterfaceFactory<AuthenticationService> { 23 public mojo::InterfaceFactory<AuthenticationService> {
23 public: 24 public:
24 GoogleAccountManagerApp() {} 25 GoogleAccountManagerApp() {}
25 ~GoogleAccountManagerApp() override {} 26 ~GoogleAccountManagerApp() override {}
26 27
27 void Initialize(mojo::ApplicationImpl* app) override { 28 void Initialize(mojo::ApplicationImpl* app) override {
28 app->ConnectToServiceDeprecated("mojo:network_service", &network_service_); 29 mojo::ConnectToService(app->shell(), "mojo:network_service",
29 app->ConnectToServiceDeprecated("mojo:files", &files_); 30 GetProxy(&network_service_));
31 mojo::ConnectToService(app->shell(), "mojo:files", GetProxy(&files_));
30 32
31 app_url_ = app->url(); 33 app_url_ = app->url();
32 } 34 }
33 35
34 bool ConfigureIncomingConnection( 36 bool ConfigureIncomingConnection(
35 mojo::ApplicationConnection* connection) override { 37 mojo::ApplicationConnection* connection) override {
36 connection->AddService<AuthenticationService>(this); 38 connection->AddService<AuthenticationService>(this);
37 return true; 39 return true;
38 } 40 }
39 41
(...skipping 19 matching lines...) Expand all
59 DISALLOW_COPY_AND_ASSIGN(GoogleAccountManagerApp); 61 DISALLOW_COPY_AND_ASSIGN(GoogleAccountManagerApp);
60 }; 62 };
61 63
62 } // namespace authentication 64 } // namespace authentication
63 65
64 MojoResult MojoMain(MojoHandle application_request) { 66 MojoResult MojoMain(MojoHandle application_request) {
65 mojo::ApplicationRunnerChromium runner( 67 mojo::ApplicationRunnerChromium runner(
66 new authentication::GoogleAccountManagerApp()); 68 new authentication::GoogleAccountManagerApp());
67 return runner.Run(application_request); 69 return runner.Run(application_request);
68 } 70 }
OLDNEW
« no previous file with comments | « services/authentication/accounts_db_manager_unittest.cc ('k') | services/clipboard/clipboard_apptest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698