| OLD | NEW |
| 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 "ash/mus/bridge/wm_shell_mus.h" | 5 #include "ash/mus/bridge/wm_shell_mus.h" |
| 6 | 6 |
| 7 #include "ash/common/default_accessibility_delegate.h" | 7 #include "ash/common/default_accessibility_delegate.h" |
| 8 #include "ash/common/display/display_info.h" | 8 #include "ash/common/display/display_info.h" |
| 9 #include "ash/common/session/session_state_delegate.h" | 9 #include "ash/common/session/session_state_delegate.h" |
| 10 #include "ash/common/shell_observer.h" | 10 #include "ash/common/shell_observer.h" |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 // A pseudo user info. | 86 // A pseudo user info. |
| 87 std::unique_ptr<user_manager::UserInfo> user_info_; | 87 std::unique_ptr<user_manager::UserInfo> user_info_; |
| 88 | 88 |
| 89 DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateStub); | 89 DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateStub); |
| 90 }; | 90 }; |
| 91 | 91 |
| 92 } // namespace | 92 } // namespace |
| 93 | 93 |
| 94 WmShellMus::WmShellMus(::mus::WindowTreeClient* client) | 94 WmShellMus::WmShellMus(::mus::WindowTreeClient* client) |
| 95 : client_(client), session_state_delegate_(new SessionStateDelegateStub) { | 95 : client_(client), session_state_delegate_(new SessionStateDelegateStub) { |
| 96 LOG(ERROR) << "JAMES new WmShellMus"; |
| 96 client_->AddObserver(this); | 97 client_->AddObserver(this); |
| 97 WmShell::Set(this); | 98 WmShell::Set(this); |
| 98 | 99 |
| 99 CreateMruWindowTracker(); | 100 CreateMruWindowTracker(); |
| 100 | 101 |
| 101 accessibility_delegate_.reset(new DefaultAccessibilityDelegate); | 102 accessibility_delegate_.reset(new DefaultAccessibilityDelegate); |
| 102 SetSystemTrayDelegate(base::WrapUnique(new DefaultSystemTrayDelegate)); | 103 SetSystemTrayDelegate(base::WrapUnique(new DefaultSystemTrayDelegate)); |
| 103 } | 104 } |
| 104 | 105 |
| 105 WmShellMus::~WmShellMus() { | 106 WmShellMus::~WmShellMus() { |
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 307 OnWindowActivated(gained_active, lost_active)); | 308 OnWindowActivated(gained_active, lost_active)); |
| 308 } | 309 } |
| 309 | 310 |
| 310 void WmShellMus::OnWillDestroyClient(::mus::WindowTreeClient* client) { | 311 void WmShellMus::OnWillDestroyClient(::mus::WindowTreeClient* client) { |
| 311 DCHECK_EQ(client, client_); | 312 DCHECK_EQ(client, client_); |
| 312 RemoveClientObserver(); | 313 RemoveClientObserver(); |
| 313 } | 314 } |
| 314 | 315 |
| 315 } // namespace mus | 316 } // namespace mus |
| 316 } // namespace ash | 317 } // namespace ash |
| OLD | NEW |