diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-03 04:55:56 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-03 04:55:56 +0000 |
| commit | 21729bcb4518c34d00a23d4fa984ea15eb19f3e2 (patch) | |
| tree | 931b50f9f7c8ed354e55e333914df3bdae971e21 /ash/test | |
| parent | 9b0a925d5195a52ecaeb4128f3a69856ec87cf0e (diff) | |
| download | chromium_src-21729bcb4518c34d00a23d4fa984ea15eb19f3e2.zip chromium_src-21729bcb4518c34d00a23d4fa984ea15eb19f3e2.tar.gz chromium_src-21729bcb4518c34d00a23d4fa984ea15eb19f3e2.tar.bz2 | |
Remove ShellDelegate::GetCycleWindowList. Because alt-tab operates on
all windows now there is no need to push the implementation to the
delegate and it can instead be consolidated. Also added a couple more
test cases, and fixed a bug that occurred if there is a single window
but it wasn't active.
BUG=120987
TEST=see bug, also covered by test.
R=jamescook@chromium.org
Review URL: http://codereview.chromium.org/9969075
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130315 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
| -rw-r--r-- | ash/test/test_shell_delegate.cc | 12 | ||||
| -rw-r--r-- | ash/test/test_shell_delegate.h | 2 |
2 files changed, 0 insertions, 14 deletions
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc index 7c9f4c3..3489412 100644 --- a/ash/test/test_shell_delegate.cc +++ b/ash/test/test_shell_delegate.cc @@ -51,18 +51,6 @@ AppListViewDelegate* TestShellDelegate::CreateAppListViewDelegate() { return NULL; } -std::vector<aura::Window*> TestShellDelegate::GetCycleWindowList( - CycleSource source) 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. - aura::Window* default_container = Shell::GetInstance()->GetContainer( - internal::kShellWindowId_DefaultContainer); - std::vector<aura::Window*> windows = default_container->children(); - std::reverse(windows.begin(), windows.end()); - return windows; -} - void TestShellDelegate::StartPartialScreenshot( ScreenshotDelegate* screenshot_delegate) { if (screenshot_delegate) diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h index 0766032..f822617 100644 --- a/ash/test/test_shell_delegate.h +++ b/ash/test/test_shell_delegate.h @@ -26,8 +26,6 @@ class TestShellDelegate : public ShellDelegate { virtual void Exit() OVERRIDE; virtual void NewWindow(bool incognito) OVERRIDE; virtual AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE; - virtual std::vector<aura::Window*> GetCycleWindowList( - CycleSource source) const OVERRIDE; virtual void StartPartialScreenshot( ScreenshotDelegate* screenshot_delegate) OVERRIDE; virtual LauncherDelegate* CreateLauncherDelegate( |