Merge file type filters in Chrome OS user picture picker

chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.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 "chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 26 matching lines @@
 #include "ui/views/widget/widget.h"
 
 namespace chromeos {
 namespace options2 {
 
 namespace {
 
 // Returns info about extensions for files we support as user images.
 ui::SelectFileDialog::FileTypeInfo GetUserImageFileTypeInfo() {
   ui::SelectFileDialog::FileTypeInfo file_type_info;
-  file_type_info.extensions.resize(5);
+  file_type_info.extensions.resize(1);
 
   file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("bmp"));
 
-  file_type_info.extensions[1].push_back(FILE_PATH_LITERAL("gif"));
+  file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("gif"));
 
-  file_type_info.extensions[2].push_back(FILE_PATH_LITERAL("jpg"));
-  file_type_info.extensions[2].push_back(FILE_PATH_LITERAL("jpeg"));
+  file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("jpg"));
+  file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("jpeg"));
 
-  file_type_info.extensions[3].push_back(FILE_PATH_LITERAL("png"));
+  file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("png"));
 
-  file_type_info.extensions[4].push_back(FILE_PATH_LITERAL("tif"));
-  file_type_info.extensions[4].push_back(FILE_PATH_LITERAL("tiff"));
+  file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("tif"));
+  file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("tiff"));
+
+  file_type_info.extension_description_overrides.resize(1);
+  file_type_info.extension_description_overrides[0] =
+      l10n_util::GetStringUTF16(IDS_IMAGE_FILES);
 
   return file_type_info;
 }
 
 // Time histogram suffix for profile image download.
 const char kProfileDownloadReason[] = "Preferences";
 
 }  // namespace
 
 ChangePictureOptionsHandler::ChangePictureOptionsHandler()
@@ skipping 344 matching lines @@
   OnPhotoAccepted(user_photo_);
 }
 
 void ChangePictureOptionsHandler::OnDecodeImageFailed(
     const ImageDecoder* decoder) {
   NOTREACHED() << "Failed to decode PNG image from WebUI";
 }
 
 }  // namespace options2
 }  // namespace chromeos