| Index: mash/wm/bridge/wm_window_mus.cc
|
| diff --git a/mash/wm/bridge/wm_window_mus.cc b/mash/wm/bridge/wm_window_mus.cc
|
| index b0a0227c9aace9a88732121dbe8bc788ddaeb848..5d816ed04a2bcd5350b3fb192f55657fa5e4372b 100644
|
| --- a/mash/wm/bridge/wm_window_mus.cc
|
| +++ b/mash/wm/bridge/wm_window_mus.cc
|
| @@ -11,7 +11,7 @@
|
| #include "ash/wm/common/wm_window_property.h"
|
| #include "components/mus/public/cpp/window.h"
|
| #include "components/mus/public/cpp/window_property.h"
|
| -#include "components/mus/public/cpp/window_tree_connection.h"
|
| +#include "components/mus/public/cpp/window_tree_client.h"
|
| #include "mash/wm/bridge/mus_layout_manager_adapter.h"
|
| #include "mash/wm/bridge/wm_globals_mus.h"
|
| #include "mash/wm/bridge/wm_root_window_controller_mus.h"
|
| @@ -501,7 +501,7 @@ bool WmWindowMus::IsFocused() const {
|
| }
|
|
|
| bool WmWindowMus::IsActive() const {
|
| - mus::Window* focused = window_->connection()->GetFocusedWindow();
|
| + mus::Window* focused = window_->window_tree()->GetFocusedWindow();
|
| return focused && window_->Contains(focused);
|
| }
|
|
|
| @@ -517,7 +517,7 @@ void WmWindowMus::Activate() {
|
|
|
| void WmWindowMus::Deactivate() {
|
| if (IsActive())
|
| - window_->connection()->ClearFocus();
|
| + window_->window_tree()->ClearFocus();
|
| }
|
|
|
| void WmWindowMus::SetFullscreen() {
|
|
|