[Athena] Fix switching activities by swiping from the right bezel

athena/wm/window_list_provider_impl.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_list_provider_impl.h"
 
 #include <algorithm>
 
 #include "athena/wm/public/window_list_provider_observer.h"
 #include "ui/aura/window.h"
@@ skipping 48 matching lines @@
 bool WindowListProviderImpl::IsWindowInList(aura::Window* window) const {
   return window->parent() == container_ && IsValidWindow(window);
 }
 
 bool WindowListProviderImpl::IsValidWindow(aura::Window* window) const {
   // TODO(oshima): crbug.com/413912
   return window->type() == ui::wm::WINDOW_TYPE_NORMAL ||
       window->type() == ui::wm::WINDOW_TYPE_PANEL;
 }
 
-void WindowListProviderImpl::MoveToFront(aura::Window* window) {
-  DCHECK(IsWindowInList(window));
-  container_->StackChildAtTop(window);
-}
-
 void WindowListProviderImpl::StackWindowFrontOf(
     aura::Window* window,
     aura::Window* reference_window) {
   DCHECK_NE(window, reference_window);
   DCHECK(IsWindowInList(window));
   DCHECK(IsWindowInList(reference_window));
   container_->StackChildAbove(window, reference_window);
 }
 
 void WindowListProviderImpl::StackWindowBehindTo(
     aura::Window* window,
     aura::Window* reference_window) {

[pkotwicz, 2014/09/19 21:58:00]

I did not add a DCHECK here because it would break AppActivityProxy::Init()

In that case a views::Widget gets activated by mistake. In the long term
ActivityManager::AddActivity() should take a parameter to indicate whether the
activity should be activated

[mfomitchev, 2014/09/22 18:04:24]

Perhaps we should create a bug for this? 
Also, can we add a check in StackWindowFrontOf which ensures that
reference_window is not an active window?

[pkotwicz, 2014/09/22 18:30:24]

I have filed a bug at crbug.com/416549

   DCHECK_NE(window, reference_window);
   DCHECK(IsWindowInList(window));
   DCHECK(IsWindowInList(reference_window));
   container_->StackChildBelow(window, reference_window);
 }
 
 void WindowListProviderImpl::OnWindowAdded(aura::Window* window) {
   if (!IsValidWindow(window) || window->parent() != container_)
     return;
   RecreateWindowList();
@@ skipping 21 matching lines @@
     return;
   DCHECK(IsWindowInList(window));
   RecreateWindowList();
   // Inform our listeners that the stacking has been changed.
   FOR_EACH_OBSERVER(WindowListProviderObserver,
                     observers_,
                     OnWindowStackingChanged());
 }
 
 }  // namespace athena