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

Side by Side Diff: chrome/browser/ui/webui/options/certificate_manager_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) 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/options/certificate_manager_handler.h" 5 #include "chrome/browser/ui/webui/options/certificate_manager_handler.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after
617 return; 617 return;
618 618
619 selected_cert_list_.push_back(cert); 619 selected_cert_list_.push_back(cert);
620 620
621 ui::SelectFileDialog::FileTypeInfo file_type_info; 621 ui::SelectFileDialog::FileTypeInfo file_type_info;
622 file_type_info.extensions.resize(1); 622 file_type_info.extensions.resize(1);
623 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("p12")); 623 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("p12"));
624 file_type_info.extension_description_overrides.push_back( 624 file_type_info.extension_description_overrides.push_back(
625 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_PKCS12_FILES)); 625 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_PKCS12_FILES));
626 file_type_info.include_all_files = true; 626 file_type_info.include_all_files = true;
627 // TODO(kinaba): http://crbug.com/140425. Turn file_type_info.support_drive
628 // on once Google Drive client on ChromeOS fully supports file writing.
629 select_file_dialog_ = ui::SelectFileDialog::Create( 627 select_file_dialog_ = ui::SelectFileDialog::Create(
630 this, new ChromeSelectFilePolicy(web_ui()->GetWebContents())); 628 this, new ChromeSelectFilePolicy(web_ui()->GetWebContents()));
631 select_file_dialog_->SelectFile( 629 select_file_dialog_->SelectFile(
632 ui::SelectFileDialog::SELECT_SAVEAS_FILE, string16(), 630 ui::SelectFileDialog::SELECT_SAVEAS_FILE, string16(),
633 base::FilePath(), &file_type_info, 1, FILE_PATH_LITERAL("p12"), 631 base::FilePath(), &file_type_info, 1, FILE_PATH_LITERAL("p12"),
634 GetParentWindow(), 632 GetParentWindow(),
635 reinterpret_cast<void*>(EXPORT_PERSONAL_FILE_SELECTED)); 633 reinterpret_cast<void*>(EXPORT_PERSONAL_FILE_SELECTED));
636 } 634 }
637 635
638 void CertificateManagerHandler::ExportAllPersonal(const ListValue* args) { 636 void CertificateManagerHandler::ExportAllPersonal(const ListValue* args) {
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
709 // so bail. 707 // so bail.
710 web_ui()->CallJavascriptFunction("CertificateRestoreOverlay.dismiss"); 708 web_ui()->CallJavascriptFunction("CertificateRestoreOverlay.dismiss");
711 ImportExportCleanup(); 709 ImportExportCleanup();
712 return; 710 return;
713 } 711 }
714 file_type_info.extensions.resize(1); 712 file_type_info.extensions.resize(1);
715 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("p12")); 713 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("p12"));
716 file_type_info.extension_description_overrides.push_back( 714 file_type_info.extension_description_overrides.push_back(
717 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_PKCS12_FILES)); 715 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_PKCS12_FILES));
718 file_type_info.include_all_files = true; 716 file_type_info.include_all_files = true;
719 file_type_info.support_drive = true;
720 select_file_dialog_ = ui::SelectFileDialog::Create( 717 select_file_dialog_ = ui::SelectFileDialog::Create(
721 this, new ChromeSelectFilePolicy(web_ui()->GetWebContents())); 718 this, new ChromeSelectFilePolicy(web_ui()->GetWebContents()));
722 select_file_dialog_->SelectFile( 719 select_file_dialog_->SelectFile(
723 ui::SelectFileDialog::SELECT_OPEN_FILE, string16(), 720 ui::SelectFileDialog::SELECT_OPEN_FILE, string16(),
724 base::FilePath(), &file_type_info, 1, FILE_PATH_LITERAL("p12"), 721 base::FilePath(), &file_type_info, 1, FILE_PATH_LITERAL("p12"),
725 GetParentWindow(), 722 GetParentWindow(),
726 reinterpret_cast<void*>(IMPORT_PERSONAL_FILE_SELECTED)); 723 reinterpret_cast<void*>(IMPORT_PERSONAL_FILE_SELECTED));
727 } 724 }
728 725
729 void CertificateManagerHandler::ImportPersonalFileSelected( 726 void CertificateManagerHandler::ImportPersonalFileSelected(
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
1146 web_ui()->CallJavascriptFunction("CertificateManager.onCheckTpmTokenReady", 1143 web_ui()->CallJavascriptFunction("CertificateManager.onCheckTpmTokenReady",
1147 ready); 1144 ready);
1148 } 1145 }
1149 #endif 1146 #endif
1150 1147
1151 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const { 1148 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const {
1152 return web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow(); 1149 return web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow();
1153 } 1150 }
1154 1151
1155 } // namespace options 1152 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/certificate_dialogs.cc ('k') | chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698