Fix crash when dragging a half width window to split view from overivew mode

athena/wm/split_view_controller.h

 // 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.
 
 #ifndef ATHENA_WM_SPLIT_VIEW_CONTROLLER_H_
 #define ATHENA_WM_SPLIT_VIEW_CONTROLLER_H_
 
 #include "athena/athena_export.h"
 #include "athena/wm/bezel_controller.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 
 namespace gfx {
+class Rect;
 class Transform;
 }
 
 namespace athena {
 class WindowListProvider;
 
 // Responsible for entering split view mode, exiting from split view mode, and
 // laying out the windows in split view mode.
 class ATHENA_EXPORT SplitViewController
     : public BezelController::ScrollDelegate {
@@ skipping 11 matching lines @@
   void ActivateSplitMode(aura::Window* left, aura::Window* right);
 
   // Resets the internal state to an inactive state. Calling this does not
   // change the window bounds/transforms etc. The caller must take care of
   // making any necessary changes.
   void DeactivateSplitMode();
 
   void ReplaceWindow(aura::Window* window,
                      aura::Window* replace_with);
 
+  // Returns the bounds that the left and right windows will have once split
+  // view is active and they are done animating. If |left_window_| and
+  // |right_window_| are still animating this may be different than their
+  // current bounds.
+  gfx::Rect GetLeftTargetBounds();
+  gfx::Rect GetRightTargetBounds();

[pkotwicz, 2014/08/21 15:46:11]

I made these methods public by design. When http://crbug.com/405964 is fixed,
AthenaContainerLayoutManager::OnWindowAddedToLayout() should use this method
instead of querying the left window's bounds.

+
   aura::Window* left_window() { return left_window_; }
   aura::Window* right_window() { return right_window_; }
 
  private:
   enum State {
     // Split View mode is not active. |left_window_| and |right_window| are
     // NULL.
     INACTIVE,
     // Two windows |left_window_| and |right_window| are shown side by side and
     // there is a horizontal scroll in progress which is dragging the separator
@@ skipping 37 matching lines @@
   int separator_position_;
 
   base::WeakPtrFactory<SplitViewController> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SplitViewController);
 };
 
 }  // namespace athena
 
 #endif  // ATHENA_WM_SPLIT_VIEW_CONTROLLER_H_