summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorkaznacheev@chromium.org <kaznacheev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-31 22:13:43 +0000
committerkaznacheev@chromium.org <kaznacheev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-31 22:13:43 +0000
commitec78a5590a932c6c7a272b254a94c95d9e2a3aa0 (patch)
treeabb64ea1aa07ef445e4a007682c9e8e4a2b7ad44 /chrome
parente975d11d11145ede2784fc263355a3fde8eb8f71 (diff)
downloadchromium_src-ec78a5590a932c6c7a272b254a94c95d9e2a3aa0.zip
chromium_src-ec78a5590a932c6c7a272b254a94c95d9e2a3aa0.tar.gz
chromium_src-ec78a5590a932c6c7a272b254a94c95d9e2a3aa0.tar.bz2
Fixed SelectFile parameter for the Wallpaper chooser
BUG=137594 Review URL: https://chromiumcodereview.appspot.com/10826084 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149292 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.cc11
1 files changed, 8 insertions, 3 deletions
diff --git a/chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.cc b/chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.cc
index 51da836..04a7219 100644
--- a/chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/set_wallpaper_options_handler.cc
@@ -34,12 +34,17 @@ namespace {
// Returns info about extensions for files we support as wallpaper images.
ui::SelectFileDialog::FileTypeInfo GetUserImageFileTypeInfo() {
ui::SelectFileDialog::FileTypeInfo file_type_info;
- file_type_info.extensions.resize(3);
+ file_type_info.extensions.resize(1);
file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("jpg"));
- file_type_info.extensions[1].push_back(FILE_PATH_LITERAL("jpeg"));
+ file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("jpeg"));
+ file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("png"));
- file_type_info.extensions[2].push_back(FILE_PATH_LITERAL("png"));
+ file_type_info.extension_description_overrides.resize(1);
+ file_type_info.extension_description_overrides[0] =
+ l10n_util::GetStringUTF16(IDS_IMAGE_FILES);
+
+ file_type_info.include_all_files = true;
return file_type_info;
}