| 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/wm/screen_pinning_controller.h" | 5 #include "ash/wm/screen_pinning_controller.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/common/wm/container_finder.h" | 10 #include "ash/common/wm/container_finder.h" |
| (...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 266 | 266 |
| 267 void ScreenPinningController::OnSystemModalContainerWindowStackingChanged( | 267 void ScreenPinningController::OnSystemModalContainerWindowStackingChanged( |
| 268 WmWindow* window) { | 268 WmWindow* window) { |
| 269 KeepDimWindowAtBottom(window->GetParent()); | 269 KeepDimWindowAtBottom(window->GetParent()); |
| 270 } | 270 } |
| 271 | 271 |
| 272 WmWindow* ScreenPinningController::CreateWindowDimmer(WmWindow* container) { | 272 WmWindow* ScreenPinningController::CreateWindowDimmer(WmWindow* container) { |
| 273 std::unique_ptr<WindowDimmer> window_dimmer = | 273 std::unique_ptr<WindowDimmer> window_dimmer = |
| 274 base::MakeUnique<WindowDimmer>(container); | 274 base::MakeUnique<WindowDimmer>(container); |
| 275 window_dimmer->SetDimOpacity(1); // Fully opaque. | 275 window_dimmer->SetDimOpacity(1); // Fully opaque. |
| 276 window_dimmer->window()->SetFullscreen(); | 276 window_dimmer->window()->SetFullscreen(true); |
| 277 window_dimmer->window()->Show(); | 277 window_dimmer->window()->Show(); |
| 278 WmWindow* window = window_dimmer->window(); | 278 WmWindow* window = window_dimmer->window(); |
| 279 window_dimmers_->Set(container, std::move(window_dimmer)); | 279 window_dimmers_->Set(container, std::move(window_dimmer)); |
| 280 return window; | 280 return window; |
| 281 } | 281 } |
| 282 | 282 |
| 283 void ScreenPinningController::OnDisplayConfigurationChanged() { | 283 void ScreenPinningController::OnDisplayConfigurationChanged() { |
| 284 // Note: this is called on display attached or detached. | 284 // Note: this is called on display attached or detached. |
| 285 if (!IsPinned()) | 285 if (!IsPinned()) |
| 286 return; | 286 return; |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 337 return; | 337 return; |
| 338 | 338 |
| 339 WindowDimmer* window_dimmer = window_dimmers_->Get(container); | 339 WindowDimmer* window_dimmer = window_dimmers_->Get(container); |
| 340 if (window_dimmer) { | 340 if (window_dimmer) { |
| 341 base::AutoReset<bool> auto_reset(&in_restacking_, true); | 341 base::AutoReset<bool> auto_reset(&in_restacking_, true); |
| 342 container->StackChildAtBottom(window_dimmer->window()); | 342 container->StackChildAtBottom(window_dimmer->window()); |
| 343 } | 343 } |
| 344 } | 344 } |
| 345 | 345 |
| 346 } // namespace ash | 346 } // namespace ash |
| OLD | NEW |