summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_file_browser_private_api.cc
diff options
context:
space:
mode:
authorrginda@chromium.org <rginda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-11 21:53:21 +0000
committerrginda@chromium.org <rginda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-11 21:53:21 +0000
commit03e204f307255e8f39aeb002f94b8eb04137e7f9 (patch)
tree2712b358ff2fb979114f648301ed338a12123de7 /chrome/browser/extensions/extension_file_browser_private_api.cc
parent7e2cef540238aec3bf13996803d61da78da1dd1d (diff)
downloadchromium_src-03e204f307255e8f39aeb002f94b8eb04137e7f9.zip
chromium_src-03e204f307255e8f39aeb002f94b8eb04137e7f9.tar.gz
chromium_src-03e204f307255e8f39aeb002f94b8eb04137e7f9.tar.bz2
File Manager: Add 'New Folder' button, fix sorting, assorted polish
file_manager.css: * Smaller margin in header to account for buttons. * No padding on sort image for the 'icon type' column. * Add icon for folders file_manager.js: * Cache data for the sort column *just* before sorting. * Scan DOM for 'visibleif' attributes to control visibility of DialogType specific elements. * Add 'New Folder' functionality. * Add new 'Icon Type' column so that files can be sorted by type. This column is a slightly special case because it has no label. * Scroll selected items back into view after a sort. * Remove leading '/' in virtual path passed in to selectFile(s). mock_chrome.js: * Remove unused strings. * Add new strings. util.js: * Refactor FileError.p.toString code so that callers can get a error mnemonic without the surrounding '[object ...]' string. main.html: * Add 'New folder' button. * Switch filename label/input to use visibleif attribute. generated_resources.grd: * Update strings extension_file_browser_private_api.cc: * Update strings. * Add local macro to reduce copy-pasta overload. BUG=chromium-os:14011 TEST=manual testing in harness and chromeos-chrome build Review URL: http://codereview.chromium.org/6827001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81160 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_file_browser_private_api.cc')
-rw-r--r--chrome/browser/extensions/extension_file_browser_private_api.cc92
1 files changed, 37 insertions, 55 deletions
diff --git a/chrome/browser/extensions/extension_file_browser_private_api.cc b/chrome/browser/extensions/extension_file_browser_private_api.cc
index ddba387..e578e12 100644
--- a/chrome/browser/extensions/extension_file_browser_private_api.cc
+++ b/chrome/browser/extensions/extension_file_browser_private_api.cc
@@ -255,61 +255,43 @@ bool FileDialogStringsFunction::RunImpl() {
result_.reset(new DictionaryValue());
DictionaryValue* dict = reinterpret_cast<DictionaryValue*>(result_.get());
- dict->SetString("LOCALE_DATE_SHORT",
- l10n_util::GetStringUTF16(IDS_LOCALE_DATE_SHORT));
- dict->SetString("LOCALE_MONTHS_SHORT",
- l10n_util::GetStringUTF16(IDS_LOCALE_MONTHS_SHORT));
- dict->SetString("LOCALE_DAYS_SHORT",
- l10n_util::GetStringUTF16(IDS_LOCALE_DAYS_SHORT));
- dict->SetString("FILES_DISPLAYED_SUMMARY",
- l10n_util::GetStringUTF16(IDS_FILE_BROWSER_FILES_DISPLAYED_SUMMARY));
- dict->SetString("FILES_SELECTED_SUMMARY",
- l10n_util::GetStringUTF16(IDS_FILE_BROWSER_FILES_SELECTED_SUMMARY));
-
- dict->SetString("BODY_FONT_FAMILY",
- l10n_util::GetStringUTF16(IDS_FILE_BROWSER_BODY_FONT_FAMILY));
- dict->SetString("BODY_FONT_SIZE",
- l10n_util::GetStringUTF16(IDS_FILE_BROWSER_BODY_FONT_SIZE));
-
- dict->SetString("ROOT_DIRECTORY_LABEL",
- l10n_util::GetStringUTF16(IDS_FILE_BROWSER_ROOT_DIRECTORY_LABEL));
- dict->SetString("NAME_COLUMN_LABEL",
- l10n_util::GetStringUTF16(IDS_FILE_BROWSER_NAME_COLUMN_LABEL));
- dict->SetString("SIZE_COLUMN_LABEL",
- l10n_util::GetStringUTF16(IDS_FILE_BROWSER_SIZE_COLUMN_LABEL));
- dict->SetString("DATE_COLUMN_LABEL",
- l10n_util::GetStringUTF16(IDS_FILE_BROWSER_DATE_COLUMN_LABEL));
- dict->SetString("PREVIEW_COLUMN_LABEL",
- l10n_util::GetStringUTF16(IDS_FILE_BROWSER_PREVIEW_COLUMN_LABEL));
-
- dict->SetString("FILENAME_LABEL",
- l10n_util::GetStringUTF16(IDS_FILE_BROWSER_FILENAME_LABEL));
-
- dict->SetString("CANCEL_LABEL",
- l10n_util::GetStringUTF16(IDS_FILE_BROWSER_CANCEL_LABEL));
- dict->SetString("OPEN_LABEL",
- l10n_util::GetStringUTF16(IDS_FILE_BROWSER_OPEN_LABEL));
- dict->SetString("SAVE_LABEL",
- l10n_util::GetStringUTF16(IDS_FILE_BROWSER_SAVE_LABEL));
-
- dict->SetString("SELECT_FOLDER_TITLE",
- l10n_util::GetStringUTF16(IDS_FILE_BROWSER_SELECT_FOLDER_TITLE));
- dict->SetString("SELECT_OPEN_FILE_TITLE",
- l10n_util::GetStringUTF16(IDS_FILE_BROWSER_SELECT_OPEN_FILE_TITLE));
- dict->SetString("SELECT_OPEN_MULTI_FILE_TITLE",
- l10n_util::GetStringUTF16(
- IDS_FILE_BROWSER_SELECT_OPEN_MULTI_FILE_TITLE));
- dict->SetString("SELECT_SAVEAS_FILE_TITLE",
- l10n_util::GetStringUTF16(IDS_FILE_BROWSER_SELECT_SAVEAS_FILE_TITLE));
-
- dict->SetString("COMPUTING_SELECTION",
- l10n_util::GetStringUTF16(IDS_FILE_BROWSER_COMPUTING_SELECTION));
- dict->SetString("NOTHING_SELECTED",
- l10n_util::GetStringUTF16(IDS_FILE_BROWSER_NOTHING_SELECTED));
- dict->SetString("ONE_FILE_SELECTED",
- l10n_util::GetStringUTF16(IDS_FILE_BROWSER_ONE_FILE_SELECTED));
- dict->SetString("MANY_FILES_SELECTED",
- l10n_util::GetStringUTF16(IDS_FILE_BROWSER_MANY_FILES_SELECTED));
+#define SET_STRING(ns, id) \
+ dict->SetString(#id, l10n_util::GetStringUTF16(ns##_##id))
+
+ SET_STRING(IDS, LOCALE_DATE_SHORT);
+ SET_STRING(IDS, LOCALE_MONTHS_SHORT);
+ SET_STRING(IDS, LOCALE_DAYS_SHORT);
+
+ SET_STRING(IDS_FILE_BROWSER, BODY_FONT_FAMILY);
+ SET_STRING(IDS_FILE_BROWSER, BODY_FONT_SIZE);
+
+ SET_STRING(IDS_FILE_BROWSER, ROOT_DIRECTORY_LABEL);
+ SET_STRING(IDS_FILE_BROWSER, NAME_COLUMN_LABEL);
+ SET_STRING(IDS_FILE_BROWSER, SIZE_COLUMN_LABEL);
+ SET_STRING(IDS_FILE_BROWSER, DATE_COLUMN_LABEL);
+ SET_STRING(IDS_FILE_BROWSER, PREVIEW_COLUMN_LABEL);
+
+ SET_STRING(IDS_FILE_BROWSER, ERROR_CREATING_FOLDER);
+ SET_STRING(IDS_FILE_BROWSER, ERROR_INVALID_FOLDER_CHARACTER);
+ SET_STRING(IDS_FILE_BROWSER, NEW_FOLDER_PROMPT);
+ SET_STRING(IDS_FILE_BROWSER, NEW_FOLDER_BUTTON_LABEL);
+ SET_STRING(IDS_FILE_BROWSER, FILENAME_LABEL);
+
+ SET_STRING(IDS_FILE_BROWSER, CANCEL_LABEL);
+ SET_STRING(IDS_FILE_BROWSER, OPEN_LABEL);
+ SET_STRING(IDS_FILE_BROWSER, SAVE_LABEL);
+
+ SET_STRING(IDS_FILE_BROWSER, SELECT_FOLDER_TITLE);
+ SET_STRING(IDS_FILE_BROWSER, SELECT_OPEN_FILE_TITLE);
+ SET_STRING(IDS_FILE_BROWSER, SELECT_OPEN_MULTI_FILE_TITLE);
+ SET_STRING(IDS_FILE_BROWSER, SELECT_SAVEAS_FILE_TITLE);
+
+ SET_STRING(IDS_FILE_BROWSER, COMPUTING_SELECTION);
+ SET_STRING(IDS_FILE_BROWSER, NOTHING_SELECTED);
+ SET_STRING(IDS_FILE_BROWSER, ONE_FILE_SELECTED);
+ SET_STRING(IDS_FILE_BROWSER, MANY_FILES_SELECTED);
+
+#undef SET_STRING
SendResponse(true);
return true;