summaryrefslogtreecommitdiffstats
path: root/ui/aura_shell/test
diff options
context:
space:
mode:
authormazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-13 09:48:54 +0000
committermazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-13 09:48:54 +0000
commitf7eb89c3297c540b90a7e429df5e4c9db91bf59f (patch)
treef1807f0392cfb699890695443f257dde3e5489bd /ui/aura_shell/test
parent28c8bbcc526556e975b7ffe964106ecef635c739 (diff)
downloadchromium_src-f7eb89c3297c540b90a7e429df5e4c9db91bf59f.zip
chromium_src-f7eb89c3297c540b90a7e429df5e4c9db91bf59f.tar.gz
chromium_src-f7eb89c3297c540b90a7e429df5e4c9db91bf59f.tar.bz2
Implement cycle window forward/backward by keyboard shortcuts.
BUG=105204 TEST=Manual Review URL: http://codereview.chromium.org/8817018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114198 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura_shell/test')
-rw-r--r--ui/aura_shell/test/aura_shell_test_base.cc3
-rw-r--r--ui/aura_shell/test/test_shell_delegate.cc36
-rw-r--r--ui/aura_shell/test/test_shell_delegate.h33
3 files changed, 71 insertions, 1 deletions
diff --git a/ui/aura_shell/test/aura_shell_test_base.cc b/ui/aura_shell/test/aura_shell_test_base.cc
index 3fe7ebd..69a52d6 100644
--- a/ui/aura_shell/test/aura_shell_test_base.cc
+++ b/ui/aura_shell/test/aura_shell_test_base.cc
@@ -5,6 +5,7 @@
#include "ui/aura_shell/test/aura_shell_test_base.h"
#include "ui/aura_shell/shell.h"
+#include "ui/aura_shell/test/test_shell_delegate.h"
namespace aura_shell {
namespace test {
@@ -19,7 +20,7 @@ void AuraShellTestBase::SetUp() {
aura::test::AuraTestBase::SetUp();
// Creates Shell and hook with Desktop.
- aura_shell::Shell::CreateInstance(NULL);
+ aura_shell::Shell::CreateInstance(new TestShellDelegate);
}
void AuraShellTestBase::TearDown() {
diff --git a/ui/aura_shell/test/test_shell_delegate.cc b/ui/aura_shell/test/test_shell_delegate.cc
new file mode 100644
index 0000000..42414b7
--- /dev/null
+++ b/ui/aura_shell/test/test_shell_delegate.cc
@@ -0,0 +1,36 @@
+// Copyright (c) 2011 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 "ui/aura_shell/test/test_shell_delegate.h"
+
+namespace aura_shell {
+namespace test {
+
+TestShellDelegate::TestShellDelegate() {
+}
+
+TestShellDelegate::~TestShellDelegate() {
+}
+
+void TestShellDelegate::CreateNewWindow() {
+}
+
+views::Widget* TestShellDelegate::CreateStatusArea() {
+ return NULL;
+}
+
+void TestShellDelegate::RequestAppListWidget(
+ const gfx::Rect& bounds,
+ const SetWidgetCallback& callback) {
+}
+
+void TestShellDelegate::LauncherItemClicked(const LauncherItem& item) {
+}
+
+bool TestShellDelegate::ConfigureLauncherItem(LauncherItem* item) {
+ return true;
+}
+
+} // namespace test
+} // namespace aura_shell
diff --git a/ui/aura_shell/test/test_shell_delegate.h b/ui/aura_shell/test/test_shell_delegate.h
new file mode 100644
index 0000000..6811d45
--- /dev/null
+++ b/ui/aura_shell/test/test_shell_delegate.h
@@ -0,0 +1,33 @@
+// Copyright (c) 2011 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 UI_AURA_SHELL_TEST_TEST_SHELL_DELEGATE_H_
+#define UI_AURA_SHELL_TEST_TEST_SHELL_DELEGATE_H_
+#pragma once
+
+#include "base/compiler_specific.h"
+#include "ui/aura_shell/shell_delegate.h"
+
+namespace aura_shell {
+namespace test {
+
+class TestShellDelegate : public ShellDelegate {
+ public:
+ TestShellDelegate();
+ virtual ~TestShellDelegate();
+
+ // Overridden from ShellDelegate:
+ virtual void CreateNewWindow() OVERRIDE;
+ virtual views::Widget* CreateStatusArea() OVERRIDE;
+ virtual void RequestAppListWidget(
+ const gfx::Rect& bounds,
+ const SetWidgetCallback& callback) OVERRIDE;
+ virtual void LauncherItemClicked(const LauncherItem& item) OVERRIDE;
+ virtual bool ConfigureLauncherItem(LauncherItem* item) OVERRIDE;
+};
+
+} // namespace test
+} // namespace aura_shell
+
+#endif // UI_AURA_SHELL_TEST_TEST_SHELL_DELEGATE_H_