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

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/util/drag_handle.h"
 #include "athena/wm/bezel_controller.h"
@@ skipping 30 matching lines @@
   SplitViewController(aura::Window* container,
                       WindowListProvider* window_list_provider);
 
   virtual ~SplitViewController();
 
   bool CanActivateSplitViewMode() const;
   bool IsSplitViewModeActive() const;
 
   // Activates split-view mode with |left| and |right| windows. If |left| and/or
   // |right| is NULL, then the first window in the window-list (which is neither
-  // |left| nor |right|) is selected instead.
-  void ActivateSplitMode(aura::Window* left, aura::Window* right);
+  // |left| nor |right|) is selected instead. |to_activate| indicates which of
+  // |left| or |right| should be activated. If |to_activate| is NULL, the
+  // currently active window is kept active if it is one of the split-view
+  // windows.
+  void ActivateSplitMode(aura::Window* left,
+                         aura::Window* right,
+                         aura::Window* to_activate);
 
   // Resets the internal state to an inactive state.
   void DeactivateSplitMode();
 
   // Replaces |window| in split-view mode with |replace_with|. Adjusts
   // |replace_with|'s visibility, transform and bounds. Resets |window|'s
   // visibility and transform but does not change its bounds.
   void ReplaceWindow(aura::Window* window,
                      aura::Window* replace_with);
 
@@ skipping 92 matching lines @@
   std::vector<aura::Window*> to_hide_;
 
   base::WeakPtrFactory<SplitViewController> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SplitViewController);
 };
 
 }  // namespace athena
 
 #endif  // ATHENA_WM_SPLIT_VIEW_CONTROLLER_H_