Aura: ShellDelegate GetCycleWindowList can request order by activity

alicet@ is working on window switching animations for compact mode. We're finding that while most-recently-used cycling works pretty well for normal mode it's pretty confusing for compact mode, since you can't see an overview of the windows.  This patch allows the window cycler controller to choose between most-recently-used and traditional linear order while we're sorting out which works better.

BUG=none
TEST=aura_shell_unittests WindowCycleControllerTest

Review URL: https://chromiumcodereview.appspot.com/9112044

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117908 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 2 deletions

diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index 92c36d7..c8e1e1e 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -33,7 +33,8 @@ AppListViewDelegate* TestShellDelegate::CreateAppListViewDelegate() {
   return NULL;
 }
 
-std::vector<aura::Window*> TestShellDelegate::GetCycleWindowList() const {
+std::vector<aura::Window*> TestShellDelegate::GetCycleWindowList(
+    CycleOrder order) const {
   // We just use the Shell's default container of windows, so tests can be
   // written with the usual CreateTestWindowWithId() calls. But window cycling
   // expects the topmost window at the front of the list, so reverse the order.
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index 50cd72d..b81b086 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -22,7 +22,8 @@ class TestShellDelegate : public ShellDelegate {
   virtual views::Widget* CreateStatusArea() OVERRIDE;
   virtual void BuildAppListModel(AppListModel* model) OVERRIDE;
   virtual AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
-  virtual std::vector<aura::Window*> GetCycleWindowList() const OVERRIDE;
+  virtual std::vector<aura::Window*> GetCycleWindowList(
+      CycleOrder order) const OVERRIDE;
   virtual void LauncherItemClicked(const LauncherItem& item) OVERRIDE;
   virtual bool ConfigureLauncherItem(LauncherItem* item) OVERRIDE;
 };