athena: A simpler implementation of WindowListProvider.

athena/wm/split_view_controller.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/split_view_controller.h"
 
 #include <cmath>
 
 #include "athena/wm/public/window_list_provider.h"
 #include "athena/wm/public/window_manager.h"
 #include "base/bind.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/events/event_handler.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
+#include "ui/wm/core/window_util.h"
 
 namespace athena {
 namespace {
 
 // An animation observer that runs a callback at the end of the animation, and
 // destroys itself.
 class CallbackAnimationObserver : public ui::ImplicitAnimationObserver {
  public:
   explicit CallbackAnimationObserver(const base::Closure& closure)
       : closure_(closure) {}
@@ skipping 10 matching lines @@
 
   const base::Closure closure_;
 
   DISALLOW_COPY_AND_ASSIGN(CallbackAnimationObserver);
 };
 
 }  // namespace
 
 SplitViewController::SplitViewController(
     aura::Window* container,
-    WindowListProvider* window_list_provider,
-    WindowManager* window_manager)
+    WindowListProvider* window_list_provider)
     : state_(INACTIVE),
       container_(container),
-      window_manager_(window_manager),
       window_list_provider_(window_list_provider),
-      current_activity_window_(NULL),
       left_window_(NULL),
       right_window_(NULL),
       separator_position_(0),
       weak_factory_(this) {
-  window_manager->AddObserver(this);
 }
 
 SplitViewController::~SplitViewController() {
-  window_manager_->RemoveObserver(this);
 }
 
 bool SplitViewController::IsSplitViewModeActive() const {
   return state_ == ACTIVE;
 }
 
 void SplitViewController::ActivateSplitMode(aura::Window* left,
                                             aura::Window* right) {
   aura::Window::Windows windows = window_list_provider_->GetWindowList();
   aura::Window::Windows::reverse_iterator iter = windows.rbegin();
@@ skipping 112 matching lines @@
 void SplitViewController::UpdateSeparatorPositionFromScrollDelta(float delta) {
   gfx::Screen* screen = gfx::Screen::GetScreenFor(container_);
   const gfx::Rect& display_bounds =
       screen->GetDisplayNearestWindow(container_).bounds();
   gfx::Rect container_bounds = container_->GetBoundsInScreen();
   separator_position_ =
       delta > 0 ? ((int)delta) + display_bounds.x() - container_bounds.x()
                 : display_bounds.right() - container_bounds.x() + delta;
 }
 
-aura::Window* SplitViewController::GetCurrentActivityWindow() {
-  if (!current_activity_window_) {
-    aura::Window::Windows windows = window_list_provider_->GetWindowList();
-    if (windows.empty())
-      return NULL;
-    current_activity_window_ = windows.back();
-  }
-  return current_activity_window_;
-}
+///////////////////////////////////////////////////////////////////////////////
+// BezelController::ScrollDelegate:
 
-///////////////////////////////////////////////////////////////////////////////
-// Begin BezelController::ScrollDelegate overrides.
 void SplitViewController::ScrollBegin(BezelController::Bezel bezel,
                                       float delta) {
   if (!CanScroll())
     return;
   state_ = SCROLLING;
-  aura::Window* current_window = GetCurrentActivityWindow();
-  CHECK(current_window);
 
   aura::Window::Windows windows = window_list_provider_->GetWindowList();
   CHECK(windows.size() >= 2);
-  aura::Window::Windows::const_iterator it =
-      std::find(windows.begin(), windows.end(), current_window);
-  CHECK(it != windows.end());
+  aura::Window::Windows::const_reverse_iterator iter = windows.rbegin();
+  aura::Window* current_window = *(iter);
+  CHECK(wm::IsActiveWindow(current_window));
 
   if (delta > 0) {
     right_window_ = current_window;
-    // reverse iterator points to the position before normal iterator |it|
-    aura::Window::Windows::const_reverse_iterator rev_it(it);
-    // circle to end if needed.
-    left_window_ = rev_it == windows.rend() ? windows.back() : *(rev_it);
+    left_window_ = *(iter + 1);
   } else {
     left_window_ = current_window;
-    ++it;
-    // circle to front if needed.
-    right_window_ = it == windows.end() ? windows.front() : *it;
+    right_window_ = *(iter + 1);
   }
 
   CHECK(left_window_);
   CHECK(right_window_);
 
-  // TODO(oshima|mfomitchev): crbug.com/388362
-  // Until we are properly hiding off-screen windows in window manager:
-  // Loop through all windows and hide them
-  for (it = windows.begin(); it != windows.end(); ++it) {
-    if (*it != left_window_ && *it != right_window_)
-      (*it)->Hide();
-  }
-
   UpdateSeparatorPositionFromScrollDelta(delta);
   UpdateLayout(false);
 }
 
-// Max distance from the scroll end position to the middle of the screen where
-// we would go into the split view mode.
-const int kMaxDistanceFromMiddle = 120;
 void SplitViewController::ScrollEnd() {
   if (state_ != SCROLLING)
     return;
 
+  // Max distance from the scroll end position to the middle of the screen where
+  // we would go into the split view mode.
+  const int kMaxDistanceFromMiddle = 120;
   int container_width = container_->GetBoundsInScreen().width();
   if (std::abs(container_width / 2 - separator_position_) <=
       kMaxDistanceFromMiddle) {
     state_ = ACTIVE;
     separator_position_ = container_width / 2;
   } else if (separator_position_ < container_width / 2) {
     separator_position_ = 0;

[mfomitchev, 2014/08/15 14:42:28]

I think we need to call wm::ActiveWindow(right_window_) here. If you've just
dragged right_window_ all the way from the right bezel, at this point
left_window is still the active window and at the top of the window stack. If
you go into the overview mode right away without activating right_window_ by
touching it, I don't think it will get activated, and left_window will show up
at the bottom of the stack incorrectly.

[sadrul, 2014/08/15 16:07:12]

Done.

-    current_activity_window_ = right_window_;
     state_ = INACTIVE;
   } else {
     separator_position_ = container_width;

[mfomitchev, 2014/08/15 14:42:28]

Ditto for wm::ActiveWindow(left_window_)

[sadrul, 2014/08/15 16:07:12]

Done.

-    current_activity_window_ = left_window_;
     state_ = INACTIVE;
   }
   UpdateLayout(true);
 }
 
 void SplitViewController::ScrollUpdate(float delta) {
   if (state_ != SCROLLING)
     return;
   UpdateSeparatorPositionFromScrollDelta(delta);
   UpdateLayout(false);
 }
 
 bool SplitViewController::CanScroll() {
   // TODO(mfomitchev): return false in vertical orientation, in full screen.
-  bool result = (!window_manager_->IsOverviewModeActive() &&
-                 !IsSplitViewModeActive() &&
+  bool result = (!IsSplitViewModeActive() &&
                  window_list_provider_->GetWindowList().size() >= 2);
   return result;
 }
 
-///////////////////////////////////////////////////////////////////////////////
-// WindowManagerObserver overrides
-void SplitViewController::OnOverviewModeEnter() {
-  if (state_ == ACTIVE) {
-    CHECK(left_window_);
-    CHECK(right_window_);
-    window_list_provider_->MoveToFront(right_window_);
-    window_list_provider_->MoveToFront(left_window_);
-    // TODO(mfomitchev): This shouldn't be done here, but the overview mode's
-    // transition animation currently looks bad if the starting transform of
-    // any window is not gfx::Transform().
-    right_window_->SetTransform(gfx::Transform());
-  } else if (current_activity_window_) {
-    window_list_provider_->MoveToFront(current_activity_window_);
-  }
-  state_ = INACTIVE;

[mfomitchev, 2014/08/15 14:42:28]

Until split-overview is implemented, going to overview means resetting the state
to splitview INACTIVE. Somebody needs to do that...

[sadrul, 2014/08/15 16:07:12]

A good fix for this for now would be to explicitly turn off the split-view mode
when going into overview mode (using oshima@'s ToggleSplitView()) (like we reset
the bezel-controller). The proper fix would be to not turn it off at all
(crbug.com/404119)

[mfomitchev, 2014/08/15 16:43:26]

Sure. So what are you going to do now? Wait for oshima's change to land first?
If you don't want to do that, I think you can simply reset
split_view_controller_ just like you do with the bezel controller for now.

-  left_window_ = NULL;
-  right_window_ = NULL;
-  current_activity_window_ = NULL;
-}
-
-void SplitViewController::OnOverviewModeExit() {
-}
-
 }  // namespace athena