Chromium Code Reviews| Index: mash/login/login.cc |
| diff --git a/mash/login/login.cc b/mash/login/login.cc |
| index c441dd8d33cb119fa478727b2d3ebddb6a6f6ff3..b3f115f1a71d7f5a5925003aae745a4417d4d2b1 100644 |
| --- a/mash/login/login.cc |
| +++ b/mash/login/login.cc |
| @@ -40,9 +40,7 @@ class UI : public views::WidgetDelegateView, |
| const shell::Identity& identity, |
| Login* login) { |
| UI* ui = new UI(login, connector); |
| - ui->StartWindowManager(); |
| - |
| - views::WindowManagerConnection::Create(connector, identity); |
| + ui->StartWindowManager(identity); |
| views::Widget* widget = new views::Widget; |
| views::Widget::InitParams params( |
| @@ -114,10 +112,11 @@ class UI : public views::WidgetDelegateView, |
| // Overridden from views::ButtonListener: |
| void ButtonPressed(views::Button* sender, const ui::Event& event) override; |
| - void StartWindowManager() { |
| + void StartWindowManager(const shell::Identity& identity) { |
| window_manager_connection_ = connector_->Connect("mojo:desktop_wm"); |
| window_manager_connection_->SetConnectionLostClosure( |
| - base::Bind(&UI::StartWindowManager, base::Unretained(this))); |
| + base::Bind(&UI::StartWindowManager, base::Unretained(this), identity)); |
| + views_mus_ = views::WindowManagerConnection::Create(connector_, identity); |
| } |
| Login* login_; |
| @@ -127,6 +126,7 @@ class UI : public views::WidgetDelegateView, |
| views::LabelButton* login_button_1_; |
| views::LabelButton* login_button_2_; |
| std::unique_ptr<shell::Connection> window_manager_connection_; |
| + std::unique_ptr<views::WindowManagerConnection> views_mus_; |
|
sky
2016/05/31 18:57:24
mooorrrr
|
| DISALLOW_COPY_AND_ASSIGN(UI); |
| }; |