Bug 1202952 - Fix directory picking for e10s on Windows by making FilePickerParent use the correct nsIFilePicker API for directory picking. r=roc
authorJonathan Watt <jwatt@jwatt.org>
Mon, 17 Aug 2015 03:03:49 +0100
changeset 294140 786caad5b4cfe1a375a512493454d2444fa9dd74
parent 294139 4f4bdab7f61d9889d5e8bd61a6566fc14d94a11e
child 294141 b91ede451160f0507b73404ab5061f5ebb0f742f
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc
bugs1202952
milestone43.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1202952 - Fix directory picking for e10s on Windows by making FilePickerParent use the correct nsIFilePicker API for directory picking. r=roc
dom/ipc/FilePickerParent.cpp
--- a/dom/ipc/FilePickerParent.cpp
+++ b/dom/ipc/FilePickerParent.cpp
@@ -134,18 +134,17 @@ FilePickerParent::Done(int16_t aResult)
   mResult = aResult;
 
   if (mResult != nsIFilePicker::returnOK) {
     unused << Send__delete__(this, void_t(), mResult);
     return;
   }
 
   nsTArray<nsRefPtr<BlobImpl>> blobs;
-  if (mMode == nsIFilePicker::modeOpenMultiple ||
-      mMode == nsIFilePicker::modeGetFolder) {
+  if (mMode == nsIFilePicker::modeOpenMultiple) {
     nsCOMPtr<nsISimpleEnumerator> iter;
     NS_ENSURE_SUCCESS_VOID(mFilePicker->GetFiles(getter_AddRefs(iter)));
 
     nsCOMPtr<nsISupports> supports;
     bool loop = true;
     while (NS_SUCCEEDED(iter->HasMoreElements(&loop)) && loop) {
       iter->GetNext(getter_AddRefs(supports));
       if (supports) {