| Index: ash/wm/overview/window_overview.cc
|
| diff --git a/ash/wm/overview/window_overview.cc b/ash/wm/overview/window_overview.cc
|
| index da615f755825d499a2b8ac56e3706114ea6c98ee..fd618b37c1c02fc93eb796fc457bbaa11f41ff5e 100644
|
| --- a/ash/wm/overview/window_overview.cc
|
| +++ b/ash/wm/overview/window_overview.cc
|
| @@ -160,8 +160,8 @@
|
| ScopedTransformOverviewWindow::kTransitionMilliseconds));
|
| settings.SetPreemptionStrategy(
|
| ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
|
| + (*iter)->Show();
|
| (*iter)->layer()->SetOpacity(1);
|
| - (*iter)->Show();
|
| }
|
| if (cursor_client_)
|
| cursor_client_->UnlockCursor();
|
| @@ -217,13 +217,10 @@
|
| old_selection->SetBoundsInScreen(
|
| GetSelectionBounds(selection_index_) + fade_out_direction,
|
| dst_display);
|
| - old_selection->Hide();
|
| old_selection->layer()->SetOpacity(0);
|
| InitializeSelectionWidget();
|
| selection_widget_->GetNativeWindow()->SetBoundsInScreen(
|
| target_bounds - fade_out_direction, dst_display);
|
| - // New selection widget starts with 0 opacity and fades in.
|
| - selection_widget_->GetNativeWindow()->layer()->SetOpacity(0);
|
| }
|
| ui::ScopedLayerAnimationSettings animation_settings(
|
| selection_widget_->GetNativeWindow()->layer()->GetAnimator());
|
| @@ -237,6 +234,8 @@
|
| } else {
|
| InitializeSelectionWidget();
|
| selection_widget_->SetBounds(target_bounds);
|
| + selection_widget_->GetNativeWindow()->layer()->SetOpacity(
|
| + kWindowOverviewSelectionOpacity);
|
| }
|
| selection_index_ = index;
|
| }
|
| @@ -448,8 +447,7 @@
|
| selection_widget_->Show();
|
| selection_widget_->GetNativeWindow()->parent()->StackChildAtBottom(
|
| selection_widget_->GetNativeWindow());
|
| - selection_widget_->GetNativeWindow()->layer()->SetOpacity(
|
| - kWindowOverviewSelectionOpacity);
|
| + selection_widget_->GetNativeWindow()->layer()->SetOpacity(0);
|
| }
|
|
|
| gfx::Rect WindowOverview::GetSelectionBounds(size_t index) {
|
|
|