diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-18 18:22:51 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-18 18:22:51 +0000 |
| commit | 194ad1dd149ad2a577cd1a41ccfdd4a1fb7cd656 (patch) | |
| tree | 8b71cea824e13b6fca3734642fdf83e56c7d47f7 /ash/test | |
| parent | 783eb300ba843d498bfb55076d81d45e77bb6fff (diff) | |
| download | chromium_src-194ad1dd149ad2a577cd1a41ccfdd4a1fb7cd656.zip chromium_src-194ad1dd149ad2a577cd1a41ccfdd4a1fb7cd656.tar.gz chromium_src-194ad1dd149ad2a577cd1a41ccfdd4a1fb7cd656.tar.bz2 | |
Tweaks for the launcher:
. App list and browser shortcut buttons can be moved around.
. Clicking the tabbed button cycles windows (creating a new one if
there isn't one).
BUG=110094
TEST=see bug
R=ben@chromium.org,jamescook@chromium.org
Review URL: http://codereview.chromium.org/9231030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118112 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
| -rw-r--r-- | ash/test/test_shell_delegate.cc | 6 | ||||
| -rw-r--r-- | ash/test/test_shell_delegate.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc index c8e1e1e..67f1022 100644 --- a/ash/test/test_shell_delegate.cc +++ b/ash/test/test_shell_delegate.cc @@ -8,6 +8,7 @@ #include "ash/shell.h" #include "ash/shell_window_ids.h" +#include "grit/ui_resources.h" #include "ui/aura/window.h" namespace ash { @@ -34,6 +35,7 @@ AppListViewDelegate* TestShellDelegate::CreateAppListViewDelegate() { } std::vector<aura::Window*> TestShellDelegate::GetCycleWindowList( + CycleSource source, 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 @@ -52,5 +54,9 @@ bool TestShellDelegate::ConfigureLauncherItem(LauncherItem* item) { return true; } +int TestShellDelegate::GetBrowserShortcutResourceId() { + return IDR_AURA_LAUNCHER_BROWSER_SHORTCUT; +} + } // namespace test } // namespace ash diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h index b81b086..c9e3ab3 100644 --- a/ash/test/test_shell_delegate.h +++ b/ash/test/test_shell_delegate.h @@ -23,9 +23,11 @@ class TestShellDelegate : public ShellDelegate { virtual void BuildAppListModel(AppListModel* model) OVERRIDE; virtual AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE; virtual std::vector<aura::Window*> GetCycleWindowList( + CycleSource source, CycleOrder order) const OVERRIDE; virtual void LauncherItemClicked(const LauncherItem& item) OVERRIDE; virtual bool ConfigureLauncherItem(LauncherItem* item) OVERRIDE; + virtual int GetBrowserShortcutResourceId() OVERRIDE; }; } // namespace test |