Enable touch text selection on Athena

athena/wm/window_overview_mode.cc

 // Copyright 2014 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 "athena/wm/window_overview_mode.h"
 
 #include <algorithm>
 #include <functional>
 #include <vector>
 
@@ skipping 92 matching lines @@
 
     // Prepare the desired transforms for all the windows, and set the initial
     // state on the windows.
     ComputeTerminalStatesForAllWindows();
     SetInitialWindowStates();
   }
 
   virtual ~WindowOverviewModeImpl() {
     container_->set_target_handler(container_->delegate());
 
-    aura::Window::Windows windows = container_->children();

[sadrul, 2014/07/25 20:43:14]

Mikhail has a CL up (https://codereview.chromium.org/420603011/) after which
this change won't be necessary.

[mohsen, 2014/07/30 22:49:46]

I talked to Mikhail and his patch might take a while to be ready to land. Maybe
we can land this CL to unblock touch selection work and then Mikhail fixes this
part along with his patch?

+    aura::Window::Windows windows = GetNormalWindows();
     if (windows.empty())
       return;
     std::for_each(windows.begin(), windows.end(), &RestoreWindowState);
   }
 
  private:
+  aura::Window::Windows GetNormalWindows() const {
+    aura::Window::Windows windows;
+    const aura::Window::Windows& children = container_->children();
+    for (aura::Window::Windows::const_iterator iter = children.begin();
+         iter != children.end();
+         iter++) {
+      if ((*iter)->type() == ui::wm::WINDOW_TYPE_NORMAL)
+        windows.push_back(*iter);
+    }
+    return windows;
+  }
+
   // Computes the transforms for all windows in both the topmost and bottom-most
   // positions. The transforms are set in the |kWindowOverviewState| property of
   // the windows.
   void ComputeTerminalStatesForAllWindows() {
-    aura::Window::Windows windows = container_->children();
+    aura::Window::Windows windows = GetNormalWindows();
     size_t window_count = windows.size();
     size_t index = 0;
     const gfx::Size container_size = container_->bounds().size();
 
     const int kGapBetweenWindowsBottom = 10;
     const int kGapBetweenWindowsTop = 5;
     const float kMinScale = 0.6f;
     const float kMaxScale = 0.95f;
 
     for (aura::Window::Windows::reverse_iterator iter = windows.rbegin();
@@ skipping 17 matching lines @@
       state->top = top_transform;
       state->bottom = bottom_transform;
       state->progress = 0.f;
       state->shadow = CreateShadowForWindow(window);
       window->SetProperty(kWindowOverviewState, state);
     }
   }
 
   // Sets the initial position for the windows for the overview mode.
   void SetInitialWindowStates() {
-    aura::Window::Windows windows = container_->children();
+    aura::Window::Windows windows = GetNormalWindows();
     size_t window_count = windows.size();
     // The initial overview state of the topmost three windows.
     const float kInitialProgress[] = { 0.5f, 0.05f, 0.01f };
     for (size_t i = 0; i < window_count; ++i) {
       float progress = 0.f;
       aura::Window* window = windows[window_count - 1 - i];
       if (i < arraysize(kInitialProgress))
         progress = kInitialProgress[i];
 
       scoped_refptr<ui::LayerAnimator> animator =
@@ skipping 42 matching lines @@
         targeter->FindTargetForLocatedEvent(container_, event));
     while (target && target->parent() != container_)
       target = target->parent();
     return target;
   }
 
   // Scroll the window list by |delta_y| amount. |delta_y| is negative when
   // scrolling up; and positive when scrolling down.
   void DoScroll(float delta_y) {
     const float kEpsilon = 1e-3f;
-    aura::Window::Windows windows = container_->children();
+    aura::Window::Windows windows = GetNormalWindows();
     float delta_y_p = std::abs(delta_y) / GetScrollableHeight();
     if (delta_y < 0) {
       // Scroll up. Start with the top-most (i.e. behind-most in terms of
       // z-index) window, and try to scroll them up.
       for (aura::Window::Windows::iterator iter = windows.begin();
            delta_y_p > kEpsilon && iter != windows.end();
            ++iter) {
         aura::Window* window = (*iter);
         WindowOverviewState* state = window->GetProperty(kWindowOverviewState);
         if (state->progress > kEpsilon) {
@@ skipping 68 matching lines @@
 
 // static
 scoped_ptr<WindowOverviewMode> WindowOverviewMode::Create(
     aura::Window* container,
     WindowOverviewModeDelegate* delegate) {
   return scoped_ptr<WindowOverviewMode>(
       new WindowOverviewModeImpl(container, delegate));
 }
 
 }  // namespace athena