| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "mash/wm/shadow_controller.h" | 5 #include "mash/wm/shadow_controller.h" |
| 6 | 6 |
| 7 #include "components/mus/public/cpp/window.h" | 7 #include "components/mus/public/cpp/window.h" |
| 8 #include "components/mus/public/cpp/window_tree_connection.h" | 8 #include "components/mus/public/cpp/window_tree_client.h" |
| 9 #include "mash/wm/property_util.h" | 9 #include "mash/wm/property_util.h" |
| 10 #include "mash/wm/shadow.h" | 10 #include "mash/wm/shadow.h" |
| 11 | 11 |
| 12 namespace mash { | 12 namespace mash { |
| 13 namespace wm { | 13 namespace wm { |
| 14 namespace { | 14 namespace { |
| 15 | 15 |
| 16 // Returns the first ancestor of |from| (including |from|) that has a shadow. | 16 // Returns the first ancestor of |from| (including |from|) that has a shadow. |
| 17 mus::Window* FindAncestorWithShadow(mus::Window* from) { | 17 mus::Window* FindAncestorWithShadow(mus::Window* from) { |
| 18 mus::Window* result = from; | 18 mus::Window* result = from; |
| 19 while (result && !GetShadow(result)) | 19 while (result && !GetShadow(result)) |
| 20 result = result->parent(); | 20 result = result->parent(); |
| 21 // Small shadows never change. | 21 // Small shadows never change. |
| 22 return result && GetShadow(result)->style() != Shadow::STYLE_SMALL ? result | 22 return result && GetShadow(result)->style() != Shadow::STYLE_SMALL ? result |
| 23 : nullptr; | 23 : nullptr; |
| 24 } | 24 } |
| 25 | 25 |
| 26 } // namespace | 26 } // namespace |
| 27 | 27 |
| 28 ShadowController::ShadowController(mus::WindowTreeConnection* window_tree) | 28 ShadowController::ShadowController(mus::WindowTreeClient* window_tree) |
| 29 : window_tree_(window_tree), active_window_(nullptr) { | 29 : window_tree_(window_tree), active_window_(nullptr) { |
| 30 window_tree_->AddObserver(this); | 30 window_tree_->AddObserver(this); |
| 31 SetActiveWindow(FindAncestorWithShadow(window_tree_->GetFocusedWindow())); | 31 SetActiveWindow(FindAncestorWithShadow(window_tree_->GetFocusedWindow())); |
| 32 } | 32 } |
| 33 | 33 |
| 34 ShadowController::~ShadowController() { | 34 ShadowController::~ShadowController() { |
| 35 window_tree_->RemoveObserver(this); | 35 window_tree_->RemoveObserver(this); |
| 36 if (active_window_) | 36 if (active_window_) |
| 37 active_window_->RemoveObserver(this); | 37 active_window_->RemoveObserver(this); |
| 38 } | 38 } |
| (...skipping 19 matching lines...) Expand all Loading... |
| 58 SetActiveWindow(FindAncestorWithShadow(gained_focus)); | 58 SetActiveWindow(FindAncestorWithShadow(gained_focus)); |
| 59 } | 59 } |
| 60 | 60 |
| 61 void ShadowController::OnWindowDestroying(mus::Window* window) { | 61 void ShadowController::OnWindowDestroying(mus::Window* window) { |
| 62 DCHECK_EQ(window, active_window_); | 62 DCHECK_EQ(window, active_window_); |
| 63 SetActiveWindow(nullptr); | 63 SetActiveWindow(nullptr); |
| 64 } | 64 } |
| 65 | 65 |
| 66 } // namespace wm | 66 } // namespace wm |
| 67 } // namespace mash | 67 } // namespace mash |
| OLD | NEW |