[ash-md] Cancels app-list (launcher) before entering overview

ash/common/wm/overview/window_selector.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.

[tdanderson, 2016/08/09 14:21:03]

Suggested shorter wording for CL description: "This change deactivates the
currently-active window upon entering overview mode in order to prevent
accelerators from targeting an active window while in overview mode."

[varkha, 2016/08/09 16:50:13]

Done.

 // 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.h"
 
 #include <algorithm>
 #include <functional>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 176 matching lines @@
       0.5 * root_window->GetBounds().width() *
           (1 - kTextFilterScreenProportion),
       kTextFilterDistanceFromTop,
       root_window->GetBounds().width() * kTextFilterScreenProportion,
       kTextFilterHeight);
 }
 
 // Initializes the text filter on the top of the main root window and requests
 // focus on its textfield. With Material Design uses |image| to place an icon
 // to the left of the text field.
-views::Widget* CreateTextFilter(views::TextfieldController* controller,
-                                WmWindow* root_window,
-                                const gfx::ImageSkia& image,
-                                int* text_filter_bottom) {
+views::Widget* CreateAndActivateTextFilter(
+    views::TextfieldController* controller,
+    WmWindow* root_window,
+    const gfx::ImageSkia& image,
+    int* text_filter_bottom) {
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params;
   params.type = views::Widget::InitParams::TYPE_WINDOW_FRAMELESS;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   params.accept_events = true;
   params.bounds = GetTextFilterPosition(root_window);
   *text_filter_bottom = params.bounds.bottom();
   root_window->GetRootWindowController()->ConfigureWidgetInitParamsForContainer(
       widget, kShellWindowId_StatusContainer, &params);
@@ skipping 30 matching lines @@
     container->AddChildView(image_view);
   } else {
     textfield->SetBackgroundColor(SK_ColorTRANSPARENT);
     textfield->SetTextColor(kTextFilterTextColor);
   }
   textfield->SetFontList(bundle.GetFontList(font_style));
   container->AddChildView(textfield);
   layout->SetFlexForView(textfield, 1);
   widget->SetContentsView(container);
 
+  // Deactivate the previously active window to prevent accelerators targeting

[tdanderson, 2016/08/09 14:21:03]

nit: "Deactivate the previously-active window to prevent accelerators from
targeting an active window and triggering actions during overview."

[varkha, 2016/08/09 16:50:14]

Done.

+  // an active window from triggering actions during overview.
+  WmWindow* active_window = WmShell::Get()->GetActiveWindow();
+  if (active_window)
+    active_window->Deactivate();

[tdanderson, 2016/08/09 14:21:03]

If possible it would be good to have a test for this. Ideally you could add one
that mimics the repro steps you showed me (entering overview while something
like the launcher is open) but I wouldn't be surprised if that was difficult to
simulate in a test. At minimum, consider adding a simple test that enters
overview and just checks that the text filter is the active window.

[varkha, 2016/08/09 16:50:13]

Done.

   // The textfield initially contains no text, so shift its position to be
   // outside the visible bounds of the screen.
   gfx::Transform transform;
   transform.Translate(0, -params.bounds.bottom());
   WmLookup::Get()->GetWindowForWidget(widget)->SetTransform(transform);
   widget->Show();
   textfield->RequestFocus();
 
   return widget;
 }
@@ skipping 66 matching lines @@
     PanelLayoutManager::Get(root)->SetShowCalloutWidgets(false);
 
     std::unique_ptr<WindowGrid> grid(new WindowGrid(root, windows, this));
     if (grid->empty())
       continue;
     num_items_ += grid->size();
     grid_list_.push_back(std::move(grid));
   }
 
   {
-    // The calls to WindowGrid::PrepareForOverview() and CreateTextFilter(...)
-    // requires some LayoutManagers (ie PanelLayoutManager) to perform layouts
-    // so that windows are correctly visible and properly animated in overview
-    // mode. Otherwise these layouts should be suppressed during overview mode
-    // so they don't conflict with overview mode animations. The
-    // |restoring_minimized_windows_| flag enables the PanelLayoutManager to
-    // make this decision.
+    // The calls to WindowGrid::PrepareForOverview() and
+    // CreateAndActivateTextFilter(...) require some LayoutManagers (i.e.
+    // PanelLayoutManager) to perform layouts so that windows are correctly
+    // visible and properly animated in overview mode. Otherwise these layouts
+    // should be suppressed during overview mode so they don't conflict with
+    // overview mode animations. The |restoring_minimized_windows_| flag enables
+    // the PanelLayoutManager to make this decision.
     base::AutoReset<bool> auto_restoring_minimized_windows(
         &restoring_minimized_windows_, true);
 
     // Do not call PrepareForOverview until all items are added to window_list_
     // as we don't want to cause any window updates until all windows in
     // overview are observed. See http://crbug.com/384495.
     for (std::unique_ptr<WindowGrid>& window_grid : grid_list_) {
       window_grid->PrepareForOverview();
       window_grid->PositionWindows(true);
     }
 
     if (ash::MaterialDesignController::IsOverviewMaterial()) {
       search_image_ =
           gfx::CreateVectorIcon(gfx::VectorIconId::OMNIBOX_SEARCH,
                                 kTextFilterIconSize, kTextFilterIconColorMD);
     }
     WmWindow* root_window = shell->GetPrimaryRootWindow();
-    text_filter_widget_.reset(CreateTextFilter(this, root_window, search_image_,
-                                               &text_filter_bottom_));
+    text_filter_widget_.reset(CreateAndActivateTextFilter(
+        this, root_window, search_image_, &text_filter_bottom_));
   }
 
   DCHECK(!grid_list_.empty());
   UMA_HISTOGRAM_COUNTS_100("Ash.WindowSelector.Items", num_items_);
 
   shell->AddActivationObserver(this);
 
   display::Screen::GetScreen()->AddObserver(this);
   shell->RecordUserMetricsAction(UMA_WINDOW_OVERVIEW);
   // Send an a11y alert.
@@ skipping 339 matching lines @@
   for (size_t i = 0; i <= grid_list_.size() &&
                      grid_list_[selected_grid_index_]->Move(direction, animate);
        i++) {
     selected_grid_index_ =
         (selected_grid_index_ + display_direction + grid_list_.size()) %
         grid_list_.size();
   }
 }
 
 }  // namespace ash