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/shell | |
| 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/shell')
| -rw-r--r-- | ash/shell/launcher_delegate_impl.cc | 6 | ||||
| -rw-r--r-- | ash/shell/launcher_delegate_impl.h | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ash/shell/launcher_delegate_impl.cc b/ash/shell/launcher_delegate_impl.cc index d5bc0a2..b38dee3 100644 --- a/ash/shell/launcher_delegate_impl.cc +++ b/ash/shell/launcher_delegate_impl.cc @@ -29,7 +29,7 @@ void LauncherDelegateImpl::OnBrowserShortcutClicked(int event_flags) { ash::shell::ToplevelWindow::CreateToplevelWindow(create_params); } -void LauncherDelegateImpl::ItemClicked(const ash::LauncherItem& item, +void LauncherDelegateImpl::ItemSelected(const ash::LauncherItem& item, const ui::Event& event) { aura::Window* window = watcher_->GetWindowByID(item.id); if (window->type() == aura::client::WINDOW_TYPE_PANEL) @@ -76,5 +76,9 @@ void LauncherDelegateImpl::OnLauncherCreated(Launcher* launcher) { void LauncherDelegateImpl::OnLauncherDestroyed(Launcher* launcher) { } +bool LauncherDelegateImpl::IsPerAppLauncher() { + return false; +} + } // namespace shell } // namespace ash diff --git a/ash/shell/launcher_delegate_impl.h b/ash/shell/launcher_delegate_impl.h index 4d7017f..e57b5b4 100644 --- a/ash/shell/launcher_delegate_impl.h +++ b/ash/shell/launcher_delegate_impl.h @@ -26,7 +26,7 @@ class LauncherDelegateImpl : public ash::LauncherDelegate { // LauncherDelegate overrides: virtual void OnBrowserShortcutClicked(int event_flags) OVERRIDE; - virtual void ItemClicked(const ash::LauncherItem& item, + virtual void ItemSelected(const ash::LauncherItem& item, const ui::Event& event) OVERRIDE; virtual int GetBrowserShortcutResourceId() OVERRIDE; virtual base::string16 GetTitle(const ash::LauncherItem& item) OVERRIDE; @@ -41,6 +41,7 @@ class LauncherDelegateImpl : public ash::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: // Used to update Launcher. Owned by main. |