| Index: ash/common/wm/overview/window_selector_item.cc
|
| diff --git a/ash/common/wm/overview/window_selector_item.cc b/ash/common/wm/overview/window_selector_item.cc
|
| index 46c15ec3ef35c8e230588d1f6a7eb9f375c31e4c..5fbf9ce1f4ffba6a072c623008dda0fb2da01e63 100644
|
| --- a/ash/common/wm/overview/window_selector_item.cc
|
| +++ b/ash/common/wm/overview/window_selector_item.cc
|
| @@ -17,7 +17,6 @@
|
| #include "ash/common/wm/overview/window_selector.h"
|
| #include "ash/common/wm/overview/window_selector_controller.h"
|
| #include "ash/common/wm/window_state.h"
|
| -#include "ash/common/wm_lookup.h"
|
| #include "ash/common/wm_shell.h"
|
| #include "ash/common/wm_window.h"
|
| #include "ash/common/wm_window_property.h"
|
| @@ -109,7 +108,7 @@ static const float kPreCloseScale = 0.02f;
|
| // Note: The fade in animation will occur after a delay where the delay is how
|
| // long the lay out animations take.
|
| void SetupFadeInAfterLayout(views::Widget* widget) {
|
| - WmWindow* window = WmLookup::Get()->GetWindowForWidget(widget);
|
| + WmWindow* window = WmWindow::Get(widget->GetNativeWindow());
|
| window->SetOpacity(0.0f);
|
| std::unique_ptr<ScopedOverviewAnimationSettings>
|
| scoped_overview_animation_settings =
|
| @@ -288,7 +287,7 @@ class WindowSelectorItem::RoundedContainerView
|
| // during the initial animation. Once the initial fade-in completes and the
|
| // overview header is fully exposed update stacking to keep the label above
|
| // the item which prevents input events from reaching the window.
|
| - WmWindow* widget_window = WmLookup::Get()->GetWindowForWidget(GetWidget());
|
| + WmWindow* widget_window = WmWindow::Get(GetWidget()->GetNativeWindow());
|
| if (widget_window && item_window_)
|
| widget_window->GetParent()->StackChildAbove(widget_window, item_window_);
|
| item_window_ = nullptr;
|
| @@ -451,8 +450,7 @@ void WindowSelectorItem::Shutdown() {
|
| // overview) results in stacking it at the top. Maintain the label window
|
| // stacking position above the item to make the header transformation more
|
| // gradual upon exiting the overview mode.
|
| - WmWindow* widget_window =
|
| - WmLookup::Get()->GetWindowForWidget(item_widget_.get());
|
| + WmWindow* widget_window = WmWindow::Get(item_widget_->GetNativeWindow());
|
|
|
| // |widget_window| was originally created in the same container as the
|
| // |transform_window_| but when closing overview the |transform_window_|
|
| @@ -626,8 +624,7 @@ void WindowSelectorItem::CreateWindowLabel(const base::string16& title) {
|
| ¶ms_label);
|
| item_widget_->set_focus_on_creation(false);
|
| item_widget_->Init(params_label);
|
| - WmWindow* widget_window =
|
| - WmLookup::Get()->GetWindowForWidget(item_widget_.get());
|
| + WmWindow* widget_window = WmWindow::Get(item_widget_->GetNativeWindow());
|
| if (transform_window_.GetTopInset()) {
|
| // For windows with headers the overview header fades in above the
|
| // original window header.
|
| @@ -692,8 +689,7 @@ void WindowSelectorItem::UpdateHeaderLayout(
|
| label_view_->SetVisible(true);
|
| SetupFadeInAfterLayout(item_widget_.get());
|
| }
|
| - WmWindow* widget_window =
|
| - WmLookup::Get()->GetWindowForWidget(item_widget_.get());
|
| + WmWindow* widget_window = WmWindow::Get(item_widget_->GetNativeWindow());
|
| std::unique_ptr<ScopedOverviewAnimationSettings> animation_settings =
|
| ScopedOverviewAnimationSettingsFactory::Get()
|
| ->CreateOverviewAnimationSettings(animation_type, widget_window);
|
| @@ -721,8 +717,7 @@ void WindowSelectorItem::AnimateOpacity(float opacity,
|
| transform_window_.SetOpacity(opacity);
|
|
|
| const float header_opacity = selected_ ? 0.f : kHeaderOpacity * opacity;
|
| - WmWindow* widget_window =
|
| - WmLookup::Get()->GetWindowForWidget(item_widget_.get());
|
| + WmWindow* widget_window = WmWindow::Get(item_widget_->GetNativeWindow());
|
| std::unique_ptr<ScopedOverviewAnimationSettings> animation_settings_label =
|
| ScopedOverviewAnimationSettingsFactory::Get()
|
| ->CreateOverviewAnimationSettings(animation_type, widget_window);
|
| @@ -738,7 +733,7 @@ void WindowSelectorItem::FadeOut(std::unique_ptr<views::Widget> widget) {
|
| widget->SetOpacity(1.f);
|
|
|
| // Fade out the widget. This animation continues past the lifetime of |this|.
|
| - WmWindow* widget_window = WmLookup::Get()->GetWindowForWidget(widget.get());
|
| + WmWindow* widget_window = WmWindow::Get(widget->GetNativeWindow());
|
| std::unique_ptr<ScopedOverviewAnimationSettings> animation_settings =
|
| ScopedOverviewAnimationSettingsFactory::Get()
|
| ->CreateOverviewAnimationSettings(
|
|
|