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

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

Issue 22165002: Change the meaning of SelectFileDialog.support_drive: it means Drive-aware callers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review fix (#2). 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/options/chromeos/change_picture_options_handle r.h" 5 #include "chrome/browser/ui/webui/options/chromeos/change_picture_options_handle r.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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("png")); 57 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("png"));
58 58
59 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("tif")); 59 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("tif"));
60 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("tiff")); 60 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("tiff"));
61 61
62 file_type_info.extension_description_overrides.resize(1); 62 file_type_info.extension_description_overrides.resize(1);
63 file_type_info.extension_description_overrides[0] = 63 file_type_info.extension_description_overrides[0] =
64 l10n_util::GetStringUTF16(IDS_IMAGE_FILES); 64 l10n_util::GetStringUTF16(IDS_IMAGE_FILES);
65 65
66 file_type_info.support_drive = true;
67 return file_type_info; 66 return file_type_info;
68 } 67 }
69 68
70 // Time histogram suffix for profile image download. 69 // Time histogram suffix for profile image download.
71 const char kProfileDownloadReason[] = "Preferences"; 70 const char kProfileDownloadReason[] = "Preferences";
72 71
73 } // namespace 72 } // namespace
74 73
75 ChangePictureOptionsHandler::ChangePictureOptionsHandler() 74 ChangePictureOptionsHandler::ChangePictureOptionsHandler()
76 : previous_image_url_(content::kAboutBlankURL), 75 : previous_image_url_(content::kAboutBlankURL),
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 SetImageFromCamera(user_photo_); 429 SetImageFromCamera(user_photo_);
431 } 430 }
432 431
433 void ChangePictureOptionsHandler::OnDecodeImageFailed( 432 void ChangePictureOptionsHandler::OnDecodeImageFailed(
434 const ImageDecoder* decoder) { 433 const ImageDecoder* decoder) {
435 NOTREACHED() << "Failed to decode PNG image from WebUI"; 434 NOTREACHED() << "Failed to decode PNG image from WebUI";
436 } 435 }
437 436
438 } // namespace options 437 } // namespace options
439 } // namespace chromeos 438 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/certificate_manager_handler.cc ('k') | ui/shell_dialogs/select_file_dialog.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698