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

Side by Side Diff: chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler.cc

Issue 10830157: [cros] Disable GIF user images. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
« no previous file with comments | « chrome/browser/resources/options2/chromeos/change_picture_options.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 4
5 #include "chrome/browser/ui/webui/options2/chromeos/change_picture_options_handl er.h" 5 #include "chrome/browser/ui/webui/options2/chromeos/change_picture_options_handl er.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 30 matching lines...) Expand all
41 41
42 namespace { 42 namespace {
43 43
44 // Returns info about extensions for files we support as user images. 44 // Returns info about extensions for files we support as user images.
45 ui::SelectFileDialog::FileTypeInfo GetUserImageFileTypeInfo() { 45 ui::SelectFileDialog::FileTypeInfo GetUserImageFileTypeInfo() {
46 ui::SelectFileDialog::FileTypeInfo file_type_info; 46 ui::SelectFileDialog::FileTypeInfo file_type_info;
47 file_type_info.extensions.resize(1); 47 file_type_info.extensions.resize(1);
48 48
49 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("bmp")); 49 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("bmp"));
50 50
51 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("gif"));
52
53 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("jpg")); 51 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("jpg"));
54 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("jpeg")); 52 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("jpeg"));
55 53
56 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("png")); 54 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("png"));
57 55
58 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("tif")); 56 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("tif"));
59 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("tiff")); 57 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("tiff"));
60 58
61 file_type_info.extension_description_overrides.resize(1); 59 file_type_info.extension_description_overrides.resize(1);
62 file_type_info.extension_description_overrides[0] = 60 file_type_info.extension_description_overrides[0] =
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 OnPhotoAccepted(user_photo_); 418 OnPhotoAccepted(user_photo_);
421 } 419 }
422 420
423 void ChangePictureOptionsHandler::OnDecodeImageFailed( 421 void ChangePictureOptionsHandler::OnDecodeImageFailed(
424 const ImageDecoder* decoder) { 422 const ImageDecoder* decoder) {
425 NOTREACHED() << "Failed to decode PNG image from WebUI"; 423 NOTREACHED() << "Failed to decode PNG image from WebUI";
426 } 424 }
427 425
428 } // namespace options2 426 } // namespace options2
429 } // namespace chromeos 427 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/resources/options2/chromeos/change_picture_options.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698