| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/wm/common/workspace/workspace_layout_manager.h" | 5 #include "ash/wm/common/workspace/workspace_layout_manager.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "ash/wm/common/always_on_top_controller.h" | 9 #include "ash/wm/common/always_on_top_controller.h" |
| 10 #include "ash/wm/common/fullscreen_window_finder.h" | 10 #include "ash/wm/common/fullscreen_window_finder.h" |
| (...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 208 // TODO(flackr): Track the active window leaving this root window and update | 208 // TODO(flackr): Track the active window leaving this root window and update |
| 209 // the fullscreen state accordingly. | 209 // the fullscreen state accordingly. |
| 210 if (params.new_parent && params.new_parent->GetRootWindow() == root_window_) { | 210 if (params.new_parent && params.new_parent->GetRootWindow() == root_window_) { |
| 211 UpdateFullscreenState(); | 211 UpdateFullscreenState(); |
| 212 UpdateShelfVisibility(); | 212 UpdateShelfVisibility(); |
| 213 } | 213 } |
| 214 } | 214 } |
| 215 | 215 |
| 216 void WorkspaceLayoutManager::OnWindowPropertyChanged( | 216 void WorkspaceLayoutManager::OnWindowPropertyChanged( |
| 217 wm::WmWindow* window, | 217 wm::WmWindow* window, |
| 218 wm::WmWindowProperty property, | 218 wm::WmWindowProperty property) { |
| 219 intptr_t old) { | |
| 220 if (property == wm::WmWindowProperty::ALWAYS_ON_TOP && | 219 if (property == wm::WmWindowProperty::ALWAYS_ON_TOP && |
| 221 window->GetBoolProperty(wm::WmWindowProperty::ALWAYS_ON_TOP)) { | 220 window->GetBoolProperty(wm::WmWindowProperty::ALWAYS_ON_TOP)) { |
| 222 root_window_controller_->GetAlwaysOnTopController() | 221 root_window_controller_->GetAlwaysOnTopController() |
| 223 ->GetContainer(window) | 222 ->GetContainer(window) |
| 224 ->AddChild(window); | 223 ->AddChild(window); |
| 225 } | 224 } |
| 226 } | 225 } |
| 227 | 226 |
| 228 void WorkspaceLayoutManager::OnWindowStackingChanged(wm::WmWindow* window) { | 227 void WorkspaceLayoutManager::OnWindowStackingChanged(wm::WmWindow* window) { |
| 229 UpdateShelfVisibility(); | 228 UpdateShelfVisibility(); |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 323 if (!delegate_) | 322 if (!delegate_) |
| 324 return; | 323 return; |
| 325 bool is_fullscreen = GetWindowForFullscreenMode(window_) != nullptr; | 324 bool is_fullscreen = GetWindowForFullscreenMode(window_) != nullptr; |
| 326 if (is_fullscreen != is_fullscreen_) { | 325 if (is_fullscreen != is_fullscreen_) { |
| 327 delegate_->OnFullscreenStateChanged(is_fullscreen); | 326 delegate_->OnFullscreenStateChanged(is_fullscreen); |
| 328 is_fullscreen_ = is_fullscreen; | 327 is_fullscreen_ = is_fullscreen; |
| 329 } | 328 } |
| 330 } | 329 } |
| 331 | 330 |
| 332 } // namespace ash | 331 } // namespace ash |
| OLD | NEW |