[ash-md] Makes Ctrl+W accelerator close a selected window in overview mode

ash/common/wm/overview/window_selector_item.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/wm/overview/window_selector_item.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/common/material_design/material_design_controller.h"
+#include "ash/common/metrics/user_metrics_action.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/overview/overview_animation_type.h"
 #include "ash/common/wm/overview/scoped_overview_animation_settings.h"
 #include "ash/common/wm/overview/scoped_overview_animation_settings_factory.h"
 #include "ash/common/wm/overview/scoped_transform_overview_window.h"
 #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_root_window_controller.h"
+#include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/common/wm_window_property.h"
 #include "base/auto_reset.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 352 matching lines @@
     inset_bounds.Inset(kWindowMargin, kWindowMargin);
   SetItemBounds(inset_bounds, OverviewAnimationType::OVERVIEW_ANIMATION_NONE);
   UpdateHeaderLayout(OverviewAnimationType::OVERVIEW_ANIMATION_NONE);
 }
 
 void WindowSelectorItem::SendAccessibleSelectionEvent() {
   window_label_button_view_->NotifyAccessibilityEvent(ui::AX_EVENT_SELECTION,
                                                       true);
 }
 
+void WindowSelectorItem::CloseWindow() {
+  if (ash::MaterialDesignController::IsOverviewMaterial()) {
+    gfx::Rect inset_bounds(target_bounds_);
+    inset_bounds.Inset(target_bounds_.width() * kPreCloseScale,
+                       target_bounds_.height() * kPreCloseScale);
+    OverviewAnimationType animation_type =
+        OverviewAnimationType::OVERVIEW_ANIMATION_CLOSING_SELECTOR_ITEM;
+    // Scale down both the window and label.
+    SetBounds(inset_bounds, animation_type);
+    // First animate opacity to an intermediate value concurrently with the
+    // scaling animation.
+    AnimateOpacity(kClosingItemOpacity, animation_type);
+
+    // Fade out the window and the label, effectively hiding them.
+    AnimateOpacity(
+        0.0, OverviewAnimationType::OVERVIEW_ANIMATION_CLOSE_SELECTOR_ITEM);
+  }
+  transform_window_.Close();
+}
+
 void WindowSelectorItem::SetDimmed(bool dimmed) {
   dimmed_ = dimmed;
   SetOpacity(dimmed ? kDimmedItemOpacity : 1.0f);
 }
 
 void WindowSelectorItem::ButtonPressed(views::Button* sender,
                                        const ui::Event& event) {
   if (sender == close_button_) {
-    if (ash::MaterialDesignController::IsOverviewMaterial()) {
-      gfx::Rect inset_bounds(target_bounds_);
-      inset_bounds.Inset(target_bounds_.width() * kPreCloseScale,
-                         target_bounds_.height() * kPreCloseScale);
-      OverviewAnimationType animation_type =
-          OverviewAnimationType::OVERVIEW_ANIMATION_CLOSING_SELECTOR_ITEM;
-      // Scale down both the window and label.
-      SetBounds(inset_bounds, animation_type);
-      // First animate opacity to an intermediate value concurrently with the
-      // scaling animation.
-      AnimateOpacity(kClosingItemOpacity, animation_type);
-
-      // Fade out the window and the label, effectively hiding them.
-      AnimateOpacity(
-          0.0, OverviewAnimationType::OVERVIEW_ANIMATION_CLOSE_SELECTOR_ITEM);
-    }
-    window_selector_->WindowClosing(this);
-    transform_window_.Close();
+    WmShell::Get()->RecordUserMetricsAction(UMA_WINDOW_OVERVIEW_CLOSE_BUTTON);
+    CloseWindow();
     return;
   }
   CHECK(sender == window_label_button_view_);
   window_selector_->SelectWindow(transform_window_.window());
 }
 
 void WindowSelectorItem::OnWindowDestroying(WmWindow* window) {
   window->RemoveObserver(this);
   transform_window_.OnWindowDestroyed();
 }
@@ skipping 211 matching lines @@
   window_label_selector_window->SetOpacity(opacity);
 }
 
 void WindowSelectorItem::UpdateCloseButtonAccessibilityName() {
   close_button_->SetAccessibleName(l10n_util::GetStringFUTF16(
       IDS_ASH_OVERVIEW_CLOSE_ITEM_BUTTON_ACCESSIBLE_NAME,
       GetWindow()->GetTitle()));
 }
 
 }  // namespace ash