| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/common/wm/overview/window_selector_item.h" | 5 #include "ash/common/wm/overview/window_selector_item.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/common/material_design/material_design_controller.h" | 10 #include "ash/common/material_design/material_design_controller.h" |
| (...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 407 : dimmed_(false), | 407 : dimmed_(false), |
| 408 root_window_(window->GetRootWindow()), | 408 root_window_(window->GetRootWindow()), |
| 409 transform_window_(window), | 409 transform_window_(window), |
| 410 in_bounds_update_(false), | 410 in_bounds_update_(false), |
| 411 selected_(false), | 411 selected_(false), |
| 412 caption_container_view_(nullptr), | 412 caption_container_view_(nullptr), |
| 413 label_view_(nullptr), | 413 label_view_(nullptr), |
| 414 close_button_(new OverviewCloseButton(this)), | 414 close_button_(new OverviewCloseButton(this)), |
| 415 window_selector_(window_selector), | 415 window_selector_(window_selector), |
| 416 background_view_(nullptr) { | 416 background_view_(nullptr) { |
| 417 CreateWindowLabel(window->GetTitle()); | 417 CreateWindowLabel(window->aura_window()->GetTitle()); |
| 418 GetWindow()->aura_window()->AddObserver(this); | 418 GetWindow()->aura_window()->AddObserver(this); |
| 419 } | 419 } |
| 420 | 420 |
| 421 WindowSelectorItem::~WindowSelectorItem() { | 421 WindowSelectorItem::~WindowSelectorItem() { |
| 422 GetWindow()->aura_window()->RemoveObserver(this); | 422 GetWindow()->aura_window()->RemoveObserver(this); |
| 423 } | 423 } |
| 424 | 424 |
| 425 WmWindow* WindowSelectorItem::GetWindow() { | 425 WmWindow* WindowSelectorItem::GetWindow() { |
| 426 return transform_window_.window(); | 426 return transform_window_.window(); |
| 427 } | 427 } |
| (...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 718 const float header_opacity = selected_ ? 0.f : kHeaderOpacity * opacity; | 718 const float header_opacity = selected_ ? 0.f : kHeaderOpacity * opacity; |
| 719 WmWindow* widget_window = WmWindow::Get(item_widget_->GetNativeWindow()); | 719 WmWindow* widget_window = WmWindow::Get(item_widget_->GetNativeWindow()); |
| 720 std::unique_ptr<ScopedOverviewAnimationSettings> animation_settings_label = | 720 std::unique_ptr<ScopedOverviewAnimationSettings> animation_settings_label = |
| 721 ScopedOverviewAnimationSettingsFactory::Get() | 721 ScopedOverviewAnimationSettingsFactory::Get() |
| 722 ->CreateOverviewAnimationSettings(animation_type, widget_window); | 722 ->CreateOverviewAnimationSettings(animation_type, widget_window); |
| 723 widget_window->SetOpacity(header_opacity); | 723 widget_window->SetOpacity(header_opacity); |
| 724 } | 724 } |
| 725 | 725 |
| 726 void WindowSelectorItem::UpdateAccessibilityName() { | 726 void WindowSelectorItem::UpdateAccessibilityName() { |
| 727 caption_container_view_->listener_button()->SetAccessibleName( | 727 caption_container_view_->listener_button()->SetAccessibleName( |
| 728 GetWindow()->GetTitle()); | 728 GetWindow()->aura_window()->GetTitle()); |
| 729 } | 729 } |
| 730 | 730 |
| 731 void WindowSelectorItem::FadeOut(std::unique_ptr<views::Widget> widget) { | 731 void WindowSelectorItem::FadeOut(std::unique_ptr<views::Widget> widget) { |
| 732 widget->SetOpacity(1.f); | 732 widget->SetOpacity(1.f); |
| 733 | 733 |
| 734 // Fade out the widget. This animation continues past the lifetime of |this|. | 734 // Fade out the widget. This animation continues past the lifetime of |this|. |
| 735 WmWindow* widget_window = WmWindow::Get(widget->GetNativeWindow()); | 735 WmWindow* widget_window = WmWindow::Get(widget->GetNativeWindow()); |
| 736 std::unique_ptr<ScopedOverviewAnimationSettings> animation_settings = | 736 std::unique_ptr<ScopedOverviewAnimationSettings> animation_settings = |
| 737 ScopedOverviewAnimationSettingsFactory::Get() | 737 ScopedOverviewAnimationSettingsFactory::Get() |
| 738 ->CreateOverviewAnimationSettings( | 738 ->CreateOverviewAnimationSettings( |
| (...skipping 16 matching lines...) Expand all Loading... |
| 755 | 755 |
| 756 gfx::SlideAnimation* WindowSelectorItem::GetBackgroundViewAnimation() { | 756 gfx::SlideAnimation* WindowSelectorItem::GetBackgroundViewAnimation() { |
| 757 return background_view_ ? background_view_->animation() : nullptr; | 757 return background_view_ ? background_view_->animation() : nullptr; |
| 758 } | 758 } |
| 759 | 759 |
| 760 WmWindow* WindowSelectorItem::GetOverviewWindowForMinimizedStateForTest() { | 760 WmWindow* WindowSelectorItem::GetOverviewWindowForMinimizedStateForTest() { |
| 761 return transform_window_.GetOverviewWindowForMinimizedState(); | 761 return transform_window_.GetOverviewWindowForMinimizedState(); |
| 762 } | 762 } |
| 763 | 763 |
| 764 } // namespace ash | 764 } // namespace ash |
| OLD | NEW |