diff options
| author | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-06 04:47:45 +0000 |
|---|---|---|
| committer | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-06 04:47:45 +0000 |
| commit | 8e7f3be248eabf5aa63be9d7af8a8626b981a48c (patch) | |
| tree | ea07703a34ca4046dbf5715e2e2e01ca75ad8442 /ash/launcher | |
| parent | ce44e51e5e0b29d3ad202777076fc29acfd0e08e (diff) | |
| download | chromium_src-8e7f3be248eabf5aa63be9d7af8a8626b981a48c.zip chromium_src-8e7f3be248eabf5aa63be9d7af8a8626b981a48c.tar.gz chromium_src-8e7f3be248eabf5aa63be9d7af8a8626b981a48c.tar.bz2 | |
Respect WindowOpenDisposition in launcher as is in app-list.
BUG=125902
TEST=manually
Review URL: http://codereview.chromium.org/10308005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135584 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/launcher')
| -rw-r--r-- | ash/launcher/launcher_delegate.h | 3 | ||||
| -rw-r--r-- | ash/launcher/launcher_view.cc | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ash/launcher/launcher_delegate.h b/ash/launcher/launcher_delegate.h index 9e5fdc6..ab7cacc 100644 --- a/ash/launcher/launcher_delegate.h +++ b/ash/launcher/launcher_delegate.h @@ -30,7 +30,8 @@ class ASH_EXPORT LauncherDelegate { virtual void CreateNewWindow() = 0; // Invoked when the user clicks on a window entry in the launcher. - virtual void ItemClicked(const LauncherItem& item) = 0; + // |event_flags| is the flags of the click event. + virtual void ItemClicked(const LauncherItem& item, int event_flags) = 0; // Returns the resource id of the image to show on the browser shortcut // button. diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc index 86a6b9c..0363188 100644 --- a/ash/launcher/launcher_view.cc +++ b/ash/launcher/launcher_view.cc @@ -621,7 +621,7 @@ void LauncherView::ShowOverflowMenu() { LauncherItems::const_iterator window_iter = model_->ItemByID(activated_id); if (window_iter == model_->items().end()) return; // Window was deleted while menu was up. - delegate_->ItemClicked(*window_iter); + delegate_->ItemClicked(*window_iter, ui::EF_NONE); #endif // !defined(OS_MACOSX) } @@ -850,7 +850,7 @@ void LauncherView::ButtonPressed(views::Button* sender, case TYPE_TABBED: case TYPE_APP_PANEL: case TYPE_APP_SHORTCUT: - delegate_->ItemClicked(model_->items()[view_index]); + delegate_->ItemClicked(model_->items()[view_index], event.flags()); break; case TYPE_APP_LIST: |