diff options
| author | ahendrickson@chromium.org <ahendrickson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-24 20:34:16 +0000 |
|---|---|---|
| committer | ahendrickson@chromium.org <ahendrickson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-24 20:34:16 +0000 |
| commit | f592032de5bc7cedc3fe009bd92646941399347a (patch) | |
| tree | 204c054287fb1a43682c3a5b6bd299b7be80076b /chrome/browser/ui/gtk/dialogs_gtk.cc | |
| parent | 2f1779f75be4a5286a1020f7e8972d271d20c2b2 (diff) | |
| download | chromium_src-f592032de5bc7cedc3fe009bd92646941399347a.zip chromium_src-f592032de5bc7cedc3fe009bd92646941399347a.tar.gz chromium_src-f592032de5bc7cedc3fe009bd92646941399347a.tar.bz2 | |
Merging the safe and dangerous download paths.
Manual testing matrix:
+--------------------------------------+------+-------+-------------+-------------+
| |Accept/Decline| Cancelled | |
| Test |Before| After |Before|After | Completed |
| |Full download |Full download| |
+--------------------------------------+------+-------+-------------+-------------+
|Drag & Drop | N/A | N/A | Y |
+--------------------------------------+------+-------+-------------+-------------+
|Safe | N/A | | | Y |
+--------------------------------------+------+-------+-------------+-------------+
|Safe | N/A | Y | N/A | |
+--------------------------------------+------+-------+-------------+-------------+
|Safe with uniquification | N/A | | N/A | Y |
+--------------------------------------+------+-------+-------------+-------------+
|Safe with uniquification | N/A | Y | N/A | |
+--------------------------------------+------+-------+-------------+-------------+
|Dangerous Accepted | Y | | N/A | Y |
+--------------------------------------+------+-------+-------------+-------------+
|Dangerous Accepted | | Y | N/A | Y |
+--------------------------------------+------+-------+-------------+-------------+
|Dangerous Accepted with uniquification| Y | | N/A | Y |
+--------------------------------------+------+-------+-------------+-------------+
|Dangerous Accepted with uniquification| | Y | N/A | Y |
+--------------------------------------+------+-------+-------------+-------------+
|Dangerous Declined | Y | | N/A | N/A |
+--------------------------------------+------+-------+-------------+-------------+
|Dangerous Declined | | Y | N/A | N/A |
+--------------------------------------+------+-------+-------------+-------------+
I couldn't figure out how to get Drag & Drop to work in Windows. All I got was a URL shortcut when I tried.
BUG=49394, 49568, 75277
TEST=Passes all download tests. Passes all tests in the above matrix.
Review URL: http://codereview.chromium.org/6588020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79313 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk/dialogs_gtk.cc')
| -rw-r--r-- | chrome/browser/ui/gtk/dialogs_gtk.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/ui/gtk/dialogs_gtk.cc b/chrome/browser/ui/gtk/dialogs_gtk.cc index c33a7d6..98a4025 100644 --- a/chrome/browser/ui/gtk/dialogs_gtk.cc +++ b/chrome/browser/ui/gtk/dialogs_gtk.cc @@ -163,8 +163,7 @@ FilePath* SelectFileDialogImpl::last_opened_path_ = NULL; // static SelectFileDialog* SelectFileDialog::Create(Listener* listener) { - DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::IO)); - DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::FILE)); + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); return new SelectFileDialogImpl(listener); } |