| Index: mash/session/session.h
|
| diff --git a/mash/session/session.h b/mash/session/session.h
|
| index 576492b102c1668fe2e33a710e3e8665b6c6e348..a10a91e5469b8295573a08ebbfbf1dcd4da01416 100644
|
| --- a/mash/session/session.h
|
| +++ b/mash/session/session.h
|
| @@ -10,7 +10,6 @@
|
|
|
| #include "base/callback.h"
|
| #include "base/macros.h"
|
| -#include "mash/session/public/interfaces/session.mojom.h"
|
| #include "mojo/public/cpp/bindings/binding_set.h"
|
| #include "mojo/public/cpp/bindings/interface_ptr_set.h"
|
| #include "services/service_manager/public/cpp/interface_factory.h"
|
| @@ -23,9 +22,7 @@ class Connection;
|
| namespace mash {
|
| namespace session {
|
|
|
| -class Session : public service_manager::Service,
|
| - public mojom::Session,
|
| - public service_manager::InterfaceFactory<mojom::Session> {
|
| +class Session : public service_manager::Service {
|
| public:
|
| Session();
|
| ~Session() override;
|
| @@ -36,24 +33,9 @@ class Session : public service_manager::Service,
|
| bool OnConnect(const service_manager::ServiceInfo& remote_info,
|
| service_manager::InterfaceRegistry* registry) override;
|
|
|
| - // mojom::Session:
|
| - void Logout() override;
|
| - void SwitchUser() override;
|
| - void AddScreenlockStateListener(
|
| - mojom::ScreenlockStateListenerPtr listener) override;
|
| - void LockScreen() override;
|
| - void UnlockScreen() override;
|
| -
|
| - // service_manager::InterfaceFactory<mojom::Session>:
|
| - void Create(const service_manager::Identity& remote_identity,
|
| - mojom::SessionRequest request) override;
|
| -
|
| void StartWindowManager();
|
| void StartQuickLaunch();
|
|
|
| - void StartScreenlock();
|
| - void StopScreenlock();
|
| -
|
| // Starts the application at |url|, running |restart_callback| if the
|
| // connection to the application is closed.
|
| void StartRestartableService(const std::string& url,
|
| @@ -61,9 +43,6 @@ class Session : public service_manager::Service,
|
|
|
| std::map<std::string, std::unique_ptr<service_manager::Connection>>
|
| connections_;
|
| - bool screen_locked_;
|
| - mojo::BindingSet<mojom::Session> bindings_;
|
| - mojo::InterfacePtrSet<mojom::ScreenlockStateListener> screenlock_listeners_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(Session);
|
| };
|
|
|