| Index: mash/login/login.h
|
| diff --git a/mash/login/login.h b/mash/login/login.h
|
| index b50837da6fd19dcbceb757da2f56d8f93113b157..8f2c9f3c7ffd6a6d2e9c347565a269d33462ae36 100644
|
| --- a/mash/login/login.h
|
| +++ b/mash/login/login.h
|
| @@ -5,49 +5,14 @@
|
| #ifndef MASH_LOGIN_LOGIN_H_
|
| #define MASH_LOGIN_LOGIN_H_
|
|
|
| -#include <map>
|
| -
|
| -#include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| -#include "mash/init/public/interfaces/init.mojom.h"
|
| -#include "mash/login/public/interfaces/login.mojom.h"
|
| -#include "mojo/services/tracing/public/cpp/tracing_impl.h"
|
| -#include "mojo/shell/public/cpp/shell_client.h"
|
| -
|
| -namespace views {
|
| -class AuraInit;
|
| +namespace mojo {
|
| +class ShellClient;
|
| }
|
|
|
| namespace mash {
|
| namespace login {
|
|
|
| -class LoginController : public mojo::ShellClient,
|
| - public mojo::InterfaceFactory<mojom::Login> {
|
| - public:
|
| - LoginController();
|
| - ~LoginController() override;
|
| -
|
| - init::mojom::Init* init() { return init_.get(); }
|
| - const std::string& login_user_id() const { return login_user_id_; }
|
| -
|
| - private:
|
| - // mojo::ShellClient:
|
| - void Initialize(mojo::Connector* connector, const mojo::Identity& identity,
|
| - uint32_t id) override;
|
| - bool AcceptConnection(mojo::Connection* connection) override;
|
| -
|
| - // mojo::InterfaceFactory<mojom::Login>:
|
| - void Create(mojo::Connection* connection,
|
| - mojom::LoginRequest request) override;
|
| -
|
| - mojo::Connector* connector_;
|
| - std::string login_user_id_;
|
| - mojo::TracingImpl tracing_;
|
| - scoped_ptr<views::AuraInit> aura_init_;
|
| - init::mojom::InitPtr init_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(LoginController);
|
| -};
|
| +mojo::ShellClient* CreateLogin();
|
|
|
| } // namespace login
|
| } // namespace mash
|
|
|