| Index: ash/common/wm/overview/scoped_transform_overview_window.cc
|
| diff --git a/ash/common/wm/overview/scoped_transform_overview_window.cc b/ash/common/wm/overview/scoped_transform_overview_window.cc
|
| index d353f4ed21f09a152fce18d79ed1f02fb43b706c..29bc0fc0c84746a1550ffea5ae1e7506525406a0 100644
|
| --- a/ash/common/wm/overview/scoped_transform_overview_window.cc
|
| +++ b/ash/common/wm/overview/scoped_transform_overview_window.cc
|
| @@ -194,7 +194,6 @@ void ScopedTransformOverviewWindow::RestoreWindow() {
|
| BeginScopedAnimation(OverviewAnimationType::OVERVIEW_ANIMATION_RESTORE_WINDOW,
|
| &animation_settings_list);
|
| SetTransform(window()->GetRootWindow(), original_transform_);
|
| - set_overview_transform(original_transform_);
|
|
|
| std::unique_ptr<ScopedOverviewAnimationSettings> animation_settings =
|
| CreateScopedOverviewAnimationSettings(
|
| @@ -218,7 +217,7 @@ void ScopedTransformOverviewWindow::RestoreWindow() {
|
| }
|
| window_->GetWindowState()->set_ignored_by_shelf(ignored_by_shelf_);
|
| SetOpacity(original_opacity_);
|
| - ShowHeaderAndResetShape();
|
| + ShowHeader();
|
| }
|
|
|
| void ScopedTransformOverviewWindow::BeginScopedAnimation(
|
| @@ -405,7 +404,7 @@ void ScopedTransformOverviewWindow::SetOpacity(float opacity) {
|
| }
|
| }
|
|
|
| -void ScopedTransformOverviewWindow::HideHeaderAndSetShape(int radius) {
|
| +void ScopedTransformOverviewWindow::HideHeader() {
|
| gfx::Rect bounds(GetTargetBoundsInScreen().size());
|
| const int inset = GetTopInset();
|
| if (inset > 0) {
|
| @@ -420,7 +419,7 @@ void ScopedTransformOverviewWindow::HideHeaderAndSetShape(int radius) {
|
| }
|
| }
|
|
|
| -void ScopedTransformOverviewWindow::ShowHeaderAndResetShape() {
|
| +void ScopedTransformOverviewWindow::ShowHeader() {
|
| ui::Layer* layer = window()->GetLayer();
|
| if (original_window_shape_) {
|
| layer->SetAlphaShape(
|
|
|