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/shell | |
| 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/shell')
| -rw-r--r-- | ash/shell/launcher_delegate_impl.cc | 3 | ||||
| -rw-r--r-- | ash/shell/launcher_delegate_impl.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ash/shell/launcher_delegate_impl.cc b/ash/shell/launcher_delegate_impl.cc index ddf4add..89dbdea 100644 --- a/ash/shell/launcher_delegate_impl.cc +++ b/ash/shell/launcher_delegate_impl.cc @@ -33,7 +33,8 @@ void LauncherDelegateImpl::CreateNewWindow() { ash::shell::ToplevelWindow::CreateToplevelWindow(create_params); } -void LauncherDelegateImpl::ItemClicked(const ash::LauncherItem& item) { +void LauncherDelegateImpl::ItemClicked(const ash::LauncherItem& item, + int event_flags) { aura::Window* window = watcher_->GetWindowByID(item.id); window->Show(); ash::wm::ActivateWindow(window); diff --git a/ash/shell/launcher_delegate_impl.h b/ash/shell/launcher_delegate_impl.h index 9a43a12..f59eeb6 100644 --- a/ash/shell/launcher_delegate_impl.h +++ b/ash/shell/launcher_delegate_impl.h @@ -28,7 +28,8 @@ class LauncherDelegateImpl : public ash::LauncherDelegate { // LauncherDelegate overrides: virtual void CreateNewTab() OVERRIDE; virtual void CreateNewWindow() OVERRIDE; - virtual void ItemClicked(const ash::LauncherItem& item) OVERRIDE; + virtual void ItemClicked(const ash::LauncherItem& item, + int event_flags) OVERRIDE; virtual int GetBrowserShortcutResourceId() OVERRIDE; virtual string16 GetTitle(const ash::LauncherItem& item) OVERRIDE; virtual ui::MenuModel* CreateContextMenu( |