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

ui/shell_dialogs/gtk/select_file_dialog_impl_gtk.cc

 // Copyright (c) 2013 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 <gtk/gtk.h>
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/file_util.h"
@@ skipping 57 matching lines @@
 
   // Notifies the listener that multiple files were chosen.
   void MultiFilesSelected(GtkWidget* dialog,
                           const std::vector<base::FilePath>& files);
 
   // Notifies the listener that no file was chosen (the action was canceled).
   // Dialog is passed so we can find that |params| pointer that was passed to
   // us when we were told to show the dialog.
   void FileNotSelected(GtkWidget* dialog);
 
-  GtkWidget* CreateSelectFolderDialog(const std::string& title,
+  GtkWidget* CreateSelectFolderDialog(
+      Type type, const std::string& title,

[sky, 2013/07/29 16:22:34]

nit: when you wrap, one param per line.

[kinuko, 2013/07/30 07:37:16]

Done.

       const base::FilePath& default_path, gfx::NativeWindow parent);
 
   GtkWidget* CreateFileOpenDialog(const std::string& title,
       const base::FilePath& default_path, gfx::NativeWindow parent);
 
   GtkWidget* CreateMultiFileOpenDialog(const std::string& title,
       const base::FilePath& default_path, gfx::NativeWindow parent);
 
   GtkWidget* CreateSaveAsDialog(const std::string& title,
       const base::FilePath& default_path, gfx::NativeWindow parent);
@@ skipping 95 matching lines @@
 
   file_type_index_ = file_type_index;
   if (file_types)
     file_types_ = *file_types;
   else
     file_types_.include_all_files = true;
 
   GtkWidget* dialog = NULL;
   switch (type) {
     case SELECT_FOLDER:
-      dialog = CreateSelectFolderDialog(title_string, default_path,
+    case SELECT_UPLOAD_FOLDER:
+      dialog = CreateSelectFolderDialog(type, title_string, default_path,
                                         owning_window);
       break;
     case SELECT_OPEN_FILE:
       dialog = CreateFileOpenDialog(title_string, default_path, owning_window);
       break;
     case SELECT_OPEN_MULTI_FILE:
       dialog = CreateMultiFileOpenDialog(title_string, default_path,
                                          owning_window);
       break;
     case SELECT_SAVEAS_FILE:
@@ skipping 139 matching lines @@
                                     default_path.value().c_str());
     }
   } else if (!last_opened_path_->empty()) {
     gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),
                                         last_opened_path_->value().c_str());
   }
   return dialog;
 }
 
 GtkWidget* SelectFileDialogImplGTK::CreateSelectFolderDialog(
+    Type type,
     const std::string& title,
     const base::FilePath& default_path,
     gfx::NativeWindow parent) {
-  std::string title_string = !title.empty() ? title :
+  std::string title_string = title;
+  if (title_string.empty()) {
+    title_string = (type == SELECT_UPLOAD_FOLDER) ?
+        l10n_util::GetStringUTF8(IDS_SELECT_UPLOAD_FOLDER_DIALOG_TITLE) :
         l10n_util::GetStringUTF8(IDS_SELECT_FOLDER_DIALOG_TITLE);
+  }
+  std::string accept_button_label = (type == SELECT_UPLOAD_FOLDER) ?
+      l10n_util::GetStringUTF8(IDS_SELECT_UPLOAD_FOLDER_DIALOG_UPLOAD_BUTTON) :
+      GTK_STOCK_OPEN;
 
   GtkWidget* dialog =
       gtk_file_chooser_dialog_new(title_string.c_str(), parent,
                                   GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
                                   GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                  GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+                                  accept_button_label.c_str(),
+                                  GTK_RESPONSE_ACCEPT,
                                   NULL);
 
   if (!default_path.empty()) {
     gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog),
                                   default_path.value().c_str());
   } else if (!last_opened_path_->empty()) {
     gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),
                                         last_opened_path_->value().c_str());
   }
   gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), FALSE);
@@ skipping 197 matching lines @@
 }  // namespace
 
 namespace ui {
 
 SelectFileDialogImpl* SelectFileDialogImpl::NewSelectFileDialogImplGTK(
     Listener* listener, ui::SelectFilePolicy* policy) {
   return new SelectFileDialogImplGTK(listener, policy);
 }
 
 }  // namespace ui