diff options
| author | skuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-30 16:35:40 +0000 |
|---|---|---|
| committer | skuhne@chromium.org <skuhne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-30 16:35:40 +0000 |
| commit | abd0190012a145eb07e755aa6cfa5c16d481cb19 (patch) | |
| tree | b64af3d5e7350de2c54db8c39ba7412791bbfe70 /ash/test | |
| parent | eb598ec8bb94289ec0cca8157549df4a567e433c (diff) | |
| download | chromium_src-abd0190012a145eb07e755aa6cfa5c16d481cb19.zip chromium_src-abd0190012a145eb07e755aa6cfa5c16d481cb19.tar.gz chromium_src-abd0190012a145eb07e755aa6cfa5c16d481cb19.tar.bz2 | |
Adding Alt+<number> shortcuts to step through jumpelists. If only a single element exists, the window get bounced.
This patch does not contain the switching for browser instances yet. Adding this before the "movable Chrome icon" lands would be possible, but would require a lot of changes (offsetting the launcher index, ..). If desired I could add a workaround for M28 - if mentioned CL does not land within the next few days.
BUG=230903
TEST=unittest
Review URL: https://chromiumcodereview.appspot.com/14551002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197384 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
| -rw-r--r-- | ash/test/test_launcher_delegate.cc | 6 | ||||
| -rw-r--r-- | ash/test/test_launcher_delegate.h | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ash/test/test_launcher_delegate.cc b/ash/test/test_launcher_delegate.cc index 9421e59..16422e3 100644 --- a/ash/test/test_launcher_delegate.cc +++ b/ash/test/test_launcher_delegate.cc @@ -66,7 +66,7 @@ void TestLauncherDelegate::OnWillRemoveWindow(aura::Window* window) { void TestLauncherDelegate::OnBrowserShortcutClicked(int event_flags) { } -void TestLauncherDelegate::ItemClicked(const ash::LauncherItem& item, +void TestLauncherDelegate::ItemSelected(const ash::LauncherItem& item, const ui::Event& event) { aura::Window* window = GetWindowByID(item.id); if (window->type() == aura::client::WINDOW_TYPE_PANEL) @@ -127,5 +127,9 @@ void TestLauncherDelegate::OnLauncherCreated(Launcher* launcher) { void TestLauncherDelegate::OnLauncherDestroyed(Launcher* launcher) { } +bool TestLauncherDelegate::IsPerAppLauncher() { + return true; +} + } // namespace test } // namespace ash diff --git a/ash/test/test_launcher_delegate.h b/ash/test/test_launcher_delegate.h index ef90495..b86b1e1 100644 --- a/ash/test/test_launcher_delegate.h +++ b/ash/test/test_launcher_delegate.h @@ -36,7 +36,7 @@ class TestLauncherDelegate : public LauncherDelegate, // LauncherDelegate implementation. virtual void OnBrowserShortcutClicked(int event_flags) OVERRIDE; - virtual void ItemClicked(const LauncherItem& item, + virtual void ItemSelected(const LauncherItem& item, const ui::Event& event) OVERRIDE; virtual int GetBrowserShortcutResourceId() OVERRIDE; virtual base::string16 GetTitle(const LauncherItem& item) OVERRIDE; @@ -50,6 +50,7 @@ class TestLauncherDelegate : public LauncherDelegate, virtual bool ShouldShowTooltip(const LauncherItem& item) OVERRIDE; virtual void OnLauncherCreated(Launcher* launcher) OVERRIDE; virtual void OnLauncherDestroyed(Launcher* launcher) OVERRIDE; + virtual bool IsPerAppLauncher() OVERRIDE; private: typedef std::map<aura::Window*, ash::LauncherID> WindowToID; |