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

Side by Side Diff: shell/application_manager/shell_impl.h

Issue 2034383003: Removed exposed_services from mojom definitions. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 4 years, 6 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #ifndef SHELL_APPLICATION_MANAGER_SHELL_IMPL_H_ 5 #ifndef SHELL_APPLICATION_MANAGER_SHELL_IMPL_H_
6 #define SHELL_APPLICATION_MANAGER_SHELL_IMPL_H_ 6 #define SHELL_APPLICATION_MANAGER_SHELL_IMPL_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "mojo/common/binding_set.h" 10 #include "mojo/common/binding_set.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 45
46 private: 46 private:
47 // This is a per-|ShellImpl| singleton. 47 // This is a per-|ShellImpl| singleton.
48 class ApplicationConnectorImpl : public mojo::ApplicationConnector { 48 class ApplicationConnectorImpl : public mojo::ApplicationConnector {
49 public: 49 public:
50 explicit ApplicationConnectorImpl(mojo::Shell* shell); 50 explicit ApplicationConnectorImpl(mojo::Shell* shell);
51 ~ApplicationConnectorImpl() override; 51 ~ApplicationConnectorImpl() override;
52 52
53 void ConnectToApplication( 53 void ConnectToApplication(
54 const mojo::String& app_url, 54 const mojo::String& app_url,
55 mojo::InterfaceRequest<mojo::ServiceProvider> services, 55 mojo::InterfaceRequest<mojo::ServiceProvider> services) override;
56 mojo::InterfaceHandle<mojo::ServiceProvider> exposed_services) override;
57 void Duplicate(mojo::InterfaceRequest<mojo::ApplicationConnector> 56 void Duplicate(mojo::InterfaceRequest<mojo::ApplicationConnector>
58 application_connector_request) override; 57 application_connector_request) override;
59 58
60 private: 59 private:
61 mojo::Shell* const shell_; 60 mojo::Shell* const shell_;
62 mojo::BindingSet<mojo::ApplicationConnector> bindings_; 61 mojo::BindingSet<mojo::ApplicationConnector> bindings_;
63 62
64 DISALLOW_COPY_AND_ASSIGN(ApplicationConnectorImpl); 63 DISALLOW_COPY_AND_ASSIGN(ApplicationConnectorImpl);
65 }; 64 };
66 65
67 // mojo::Shell implementation: 66 // mojo::Shell implementation:
68 void ConnectToApplication( 67 void ConnectToApplication(
69 const mojo::String& app_url, 68 const mojo::String& app_url,
70 mojo::InterfaceRequest<mojo::ServiceProvider> services, 69 mojo::InterfaceRequest<mojo::ServiceProvider> services) override;
71 mojo::InterfaceHandle<mojo::ServiceProvider> exposed_services) override;
72 void CreateApplicationConnector( 70 void CreateApplicationConnector(
73 mojo::InterfaceRequest<mojo::ApplicationConnector> 71 mojo::InterfaceRequest<mojo::ApplicationConnector>
74 application_connector_request) override; 72 application_connector_request) override;
75 73
76 ApplicationManager* const manager_; 74 ApplicationManager* const manager_;
77 const Identity identity_; 75 const Identity identity_;
78 base::Closure on_application_end_; 76 base::Closure on_application_end_;
79 mojo::ApplicationPtr application_; 77 mojo::ApplicationPtr application_;
80 mojo::Binding<mojo::Shell> binding_; 78 mojo::Binding<mojo::Shell> binding_;
81 79
82 ApplicationConnectorImpl application_connector_impl_; 80 ApplicationConnectorImpl application_connector_impl_;
83 81
84 DISALLOW_COPY_AND_ASSIGN(ShellImpl); 82 DISALLOW_COPY_AND_ASSIGN(ShellImpl);
85 }; 83 };
86 84
87 } // namespace shell 85 } // namespace shell
88 86
89 #endif // SHELL_APPLICATION_MANAGER_SHELL_IMPL_H_ 87 #endif // SHELL_APPLICATION_MANAGER_SHELL_IMPL_H_
OLDNEW
« no previous file with comments | « shell/application_manager/application_manager_unittest.cc ('k') | shell/application_manager/shell_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698