Change dialog texts for folder upload to explicitly indicate it's for 'Uploading'

ui/shell_dialogs/select_file_dialog_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/shell_dialogs/select_file_dialog_win.h"
 
 #include <windows.h>
 #include <commdlg.h>
 #include <shlobj.h>
 
@@ skipping 557 matching lines @@
                      base::Unretained(listener_)));
       return;
     } else if (type == SELECT_OPEN_MULTI_FILE) {
       aura::HandleOpenMultipleFiles(
           UTF16ToWide(title),
           default_path,
           GetFilterForFileTypes(*file_types),
           base::Bind(&ui::SelectFileDialog::Listener::MultiFilesSelected,
                      base::Unretained(listener_)));
       return;
-    } else if (type == SELECT_FOLDER) {
+    } else if (type == SELECT_FOLDER || type == SELECT_UPLOAD_FOLDER) {
+      std::string16 title_string = title;
+      if (type == SELECT_UPLOAD_FOLDER && title_string.empty()) {
+        // If it's for uploading don't use default dialog title to
+        // make sure we clearly tell it's for uploading.
+        title_string = l10n_util::GetStringUTF16(
+            IDS_SELECT_UPLOAD_FOLDER_DIALOG_TITLE);
+      }
       aura::HandleSelectFolder(
-          UTF16ToWide(title),
+          UTF16ToWide(title_string),
           base::Bind(&ui::SelectFileDialog::Listener::FileSelected,
                      base::Unretained(listener_)));
       return;
     }
   }
   HWND owner = owning_window
                ? owning_window->GetRootWindow()->GetAcceleratedWidget() : NULL;
 #else
   HWND owner = owning_window;
 #endif
@@ skipping 26 matching lines @@
   listener_ = NULL;
 }
 
 void SelectFileDialogImpl::ExecuteSelectFile(
     const ExecuteSelectParams& params) {
   base::string16 filter = GetFilterForFileTypes(params.file_types);
 
   base::FilePath path = params.default_path;
   bool success = false;
   unsigned filter_index = params.file_type_index;
-  if (params.type == SELECT_FOLDER) {
-    success = RunSelectFolderDialog(params.title,
+  if (params.type == SELECT_FOLDER || params.type == SELECT_UPLOAD_FOLDER) {
+    std::wstring title = params.title;
+    if (title.empty() && params.type == SELECT_UPLOAD_FOLDER) {
+      // If it's for uploading don't use default dialog title to
+      // make sure we clearly tell it's for uploading.
+      title = UTF16ToWide(
+          l10n_util::GetStringUTF16(IDS_SELECT_UPLOAD_FOLDER_DIALOG_TITLE));
+    }
+    success = RunSelectFolderDialog(title,
                                     params.run_state.owner,
                                     &path);
   } else if (params.type == SELECT_SAVEAS_FILE) {
     std::wstring path_as_wstring = path.value();
     success = SaveFileAsWithFilter(params.run_state.owner,
         params.default_path.value(), filter,
         params.default_extension, false, &filter_index, &path_as_wstring);
     if (success)
       path = base::FilePath(path_as_wstring);
     DisableOwner(params.run_state.owner);
@@ skipping 281 matching lines @@
   return return_value;
 }
 
 SelectFileDialog* CreateWinSelectFileDialog(
     SelectFileDialog::Listener* listener,
     SelectFilePolicy* policy) {
   return new SelectFileDialogImpl(listener, policy);
 }
 
 }  // namespace ui