| 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/panels/panel_layout_manager.h" | 5 #include "ash/wm/panels/panel_layout_manager.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <map> | 8 #include <map> |
| 9 | 9 |
| 10 #include "ash/launcher/launcher.h" | 10 #include "ash/launcher/launcher.h" |
| (...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 388 aura::Window* lost_active) { | 388 aura::Window* lost_active) { |
| 389 // Ignore if the panel that is not managed by this was activated. | 389 // Ignore if the panel that is not managed by this was activated. |
| 390 if (gained_active && | 390 if (gained_active && |
| 391 gained_active->type() == aura::client::WINDOW_TYPE_PANEL && | 391 gained_active->type() == aura::client::WINDOW_TYPE_PANEL && |
| 392 gained_active->parent() == panel_container_) { | 392 gained_active->parent() == panel_container_) { |
| 393 UpdateStacking(gained_active); | 393 UpdateStacking(gained_active); |
| 394 UpdateCallouts(); | 394 UpdateCallouts(); |
| 395 } | 395 } |
| 396 } | 396 } |
| 397 | 397 |
| 398 void PanelLayoutManager::OnWindowActivationRequestCompleted( |
| 399 aura::Window* request_active, aura::Window* actual_active) { |
| 400 } |
| 401 |
| 398 //////////////////////////////////////////////////////////////////////////////// | 402 //////////////////////////////////////////////////////////////////////////////// |
| 399 // PanelLayoutManager private implementation: | 403 // PanelLayoutManager private implementation: |
| 400 | 404 |
| 401 void PanelLayoutManager::MinimizePanel(aura::Window* panel) { | 405 void PanelLayoutManager::MinimizePanel(aura::Window* panel) { |
| 402 views::corewm::SetWindowVisibilityAnimationType( | 406 views::corewm::SetWindowVisibilityAnimationType( |
| 403 panel, WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE); | 407 panel, WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE); |
| 404 panel->Hide(); | 408 panel->Hide(); |
| 405 if (wm::IsActiveWindow(panel)) | 409 if (wm::IsActiveWindow(panel)) |
| 406 wm::DeactivateWindow(panel); | 410 wm::DeactivateWindow(panel); |
| 407 Relayout(); | 411 Relayout(); |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 618 | 622 |
| 619 SetChildBoundsDirect(callout_widget->GetNativeWindow(), callout_bounds); | 623 SetChildBoundsDirect(callout_widget->GetNativeWindow(), callout_bounds); |
| 620 panel_container_->StackChildAbove(callout_widget->GetNativeWindow(), | 624 panel_container_->StackChildAbove(callout_widget->GetNativeWindow(), |
| 621 panel); | 625 panel); |
| 622 callout_widget->Show(); | 626 callout_widget->Show(); |
| 623 } | 627 } |
| 624 } | 628 } |
| 625 | 629 |
| 626 } // namespace internal | 630 } // namespace internal |
| 627 } // namespace ash | 631 } // namespace ash |
| OLD | NEW |