diff options
Diffstat (limited to 'dom/html')
| -rw-r--r-- | dom/html/HTMLInputElement.cpp | 15 | ||||
| -rw-r--r-- | dom/html/nsIFormControl.h | 4 |
2 files changed, 3 insertions, 16 deletions
diff --git a/dom/html/HTMLInputElement.cpp b/dom/html/HTMLInputElement.cpp index 52062c4b9..d09bc3103 100644 --- a/dom/html/HTMLInputElement.cpp +++ b/dom/html/HTMLInputElement.cpp @@ -959,13 +959,6 @@ UploadLastDir::FetchDirectoryAndDisplayPicker(nsIDocument* aDoc, nsCOMPtr<nsIContentPrefCallback2> prefCallback = new UploadLastDir::ContentPrefCallback(aFilePicker, aFpCallback); -#ifdef MOZ_B2G - if (XRE_IsContentProcess()) { - prefCallback->HandleCompletion(nsIContentPrefCallback2::COMPLETE_ERROR); - return NS_OK; - } -#endif - // Attempt to get the CPS, if it's not present we'll fallback to use the Desktop folder nsCOMPtr<nsIContentPrefService2> contentPrefService = do_GetService(NS_CONTENT_PREF_SERVICE_CONTRACTID); @@ -990,12 +983,6 @@ UploadLastDir::StoreLastUsedDirectory(nsIDocument* aDoc, nsIFile* aDir) return NS_OK; } -#ifdef MOZ_B2G - if (XRE_IsContentProcess()) { - return NS_OK; - } -#endif - nsCOMPtr<nsIURI> docURI = aDoc->GetDocumentURI(); NS_PRECONDITION(docURI, "docURI is null"); @@ -6013,7 +6000,7 @@ HTMLInputElement::ChooseDirectory(ErrorResult& aRv) // "Pick Folder..." button on platforms that don't have a directory picker // we have to redirect to the file picker here. InitFilePicker( -#if defined(ANDROID) || defined(MOZ_B2G) +#if defined(ANDROID) // No native directory picker - redirect to plain file picker FILE_PICKER_FILE #else diff --git a/dom/html/nsIFormControl.h b/dom/html/nsIFormControl.h index e07f7c829..34380bc67 100644 --- a/dom/html/nsIFormControl.h +++ b/dom/html/nsIFormControl.h @@ -267,8 +267,8 @@ nsIFormControl::IsSingleLineTextControl(bool aExcludePassword, uint32_t aType) aType == NS_FORM_INPUT_TEL || aType == NS_FORM_INPUT_URL || // TODO: those are temporary until bug 773205 is fixed. -#if defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GONK) - // On Android/B2G, date/time input appears as a normal text box. +#if defined(MOZ_WIDGET_ANDROID) + // On Android, date/time input appears as a normal text box. aType == NS_FORM_INPUT_TIME || aType == NS_FORM_INPUT_DATE || #endif |