diff options
| author | koz@chromium.org <koz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 02:59:58 +0000 |
|---|---|---|
| committer | koz@chromium.org <koz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 02:59:58 +0000 |
| commit | 7a66545cf647e46e6cfd924af0582e9d5af3a55a (patch) | |
| tree | dfde1bed3255cdac2ed75449a2bfe992b5746ce2 /ui/app_list | |
| parent | f73104ffcf1a682aa3214f4d983a3123bd569003 (diff) | |
| download | chromium_src-7a66545cf647e46e6cfd924af0582e9d5af3a55a.zip chromium_src-7a66545cf647e46e6cfd924af0582e9d5af3a55a.tar.gz chromium_src-7a66545cf647e46e6cfd924af0582e9d5af3a55a.tar.bz2 | |
Favor ash dragging over win32 dragging in the Win8/ash app launcher.
BUG=326903
Review URL: https://codereview.chromium.org/103453004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239983 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/app_list')
| -rw-r--r-- | ui/app_list/views/apps_grid_view.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ui/app_list/views/apps_grid_view.cc b/ui/app_list/views/apps_grid_view.cc index 0c94965..3c486ca 100644 --- a/ui/app_list/views/apps_grid_view.cc +++ b/ui/app_list/views/apps_grid_view.cc @@ -482,6 +482,11 @@ void AppsGridView::StartSettingUpSynchronousDrag() { if (!delegate_) return; + // Favor the drag and drop host over native win32 drag. For the Win8/ash + // launcher we want to have ashes drag and drop over win32's. + if (drag_and_drop_host_) + return; + delegate_->GetShortcutPathForApp( drag_view_->model()->id(), base::Bind(&AppsGridView::OnGotShortcutPath, base::Unretained(this))); |