Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(229)

Side by Side Diff: chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc

Issue 18627002: Change dialog texts for folder upload to explicitly indicate it's for 'Uploading' (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: build fix Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 #include "chrome/browser/chromeos/extensions/file_manager/file_manager_util.h" 4 #include "chrome/browser/chromeos/extensions/file_manager/file_manager_util.h"
5 5
6 #include "ash/shell.h" 6 #include "ash/shell.h"
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/json/json_writer.h" 9 #include "base/json/json_writer.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 std::string type_str; 172 std::string type_str;
173 switch (dialog_type) { 173 switch (dialog_type) {
174 case ui::SelectFileDialog::SELECT_NONE: 174 case ui::SelectFileDialog::SELECT_NONE:
175 type_str = "full-page"; 175 type_str = "full-page";
176 break; 176 break;
177 177
178 case ui::SelectFileDialog::SELECT_FOLDER: 178 case ui::SelectFileDialog::SELECT_FOLDER:
179 type_str = "folder"; 179 type_str = "folder";
180 break; 180 break;
181 181
182 case ui::SelectFileDialog::SELECT_UPLOAD_FOLDER:
183 type_str = "upload-folder";
184 break;
185
182 case ui::SelectFileDialog::SELECT_SAVEAS_FILE: 186 case ui::SelectFileDialog::SELECT_SAVEAS_FILE:
183 type_str = "saveas-file"; 187 type_str = "saveas-file";
184 break; 188 break;
185 189
186 case ui::SelectFileDialog::SELECT_OPEN_FILE: 190 case ui::SelectFileDialog::SELECT_OPEN_FILE:
187 type_str = "open-file"; 191 type_str = "open-file";
188 break; 192 break;
189 193
190 case ui::SelectFileDialog::SELECT_OPEN_MULTI_FILE: 194 case ui::SelectFileDialog::SELECT_OPEN_MULTI_FILE:
191 type_str = "open-multi-file"; 195 type_str = "open-multi-file";
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
645 switch (dialog_type) { 649 switch (dialog_type) {
646 case ui::SelectFileDialog::SELECT_NONE: 650 case ui::SelectFileDialog::SELECT_NONE:
647 // Full page file manager doesn't need a title. 651 // Full page file manager doesn't need a title.
648 break; 652 break;
649 653
650 case ui::SelectFileDialog::SELECT_FOLDER: 654 case ui::SelectFileDialog::SELECT_FOLDER:
651 title = l10n_util::GetStringUTF16( 655 title = l10n_util::GetStringUTF16(
652 IDS_FILE_BROWSER_SELECT_FOLDER_TITLE); 656 IDS_FILE_BROWSER_SELECT_FOLDER_TITLE);
653 break; 657 break;
654 658
659 case ui::SelectFileDialog::SELECT_UPLOAD_FOLDER:
660 title = l10n_util::GetStringUTF16(
661 IDS_FILE_BROWSER_SELECT_UPLOAD_FOLDER_TITLE);
662 break;
663
655 case ui::SelectFileDialog::SELECT_SAVEAS_FILE: 664 case ui::SelectFileDialog::SELECT_SAVEAS_FILE:
656 title = l10n_util::GetStringUTF16( 665 title = l10n_util::GetStringUTF16(
657 IDS_FILE_BROWSER_SELECT_SAVEAS_FILE_TITLE); 666 IDS_FILE_BROWSER_SELECT_SAVEAS_FILE_TITLE);
658 break; 667 break;
659 668
660 case ui::SelectFileDialog::SELECT_OPEN_FILE: 669 case ui::SelectFileDialog::SELECT_OPEN_FILE:
661 title = l10n_util::GetStringUTF16( 670 title = l10n_util::GetStringUTF16(
662 IDS_FILE_BROWSER_SELECT_OPEN_FILE_TITLE); 671 IDS_FILE_BROWSER_SELECT_OPEN_FILE_TITLE);
663 break; 672 break;
664 673
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
855 // If the file doesn't have an extension or its mime-type cannot be 864 // If the file doesn't have an extension or its mime-type cannot be
856 // determined, then indicate that it has the empty mime-type. This will 865 // determined, then indicate that it has the empty mime-type. This will
857 // only be matched if the Web Intents accepts "*" or "*/*". 866 // only be matched if the Web Intents accepts "*" or "*/*".
858 return ""; 867 return "";
859 } else { 868 } else {
860 return mime_type; 869 return mime_type;
861 } 870 }
862 } 871 }
863 872
864 } // namespace file_manager_util 873 } // namespace file_manager_util
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc ('k') | chrome/browser/file_select_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698