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

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

Issue 10667026: Start consolidating cross-port file selection code into ui/base/dialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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/options2/certificate_manager_handler2.h" 5 #include "chrome/browser/ui/webui/options2/certificate_manager_handler2.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/file_util.h" // for FileAccessProvider 9 #include "base/file_util.h" // for FileAccessProvider
10 #include "base/memory/scoped_vector.h" 10 #include "base/memory/scoped_vector.h"
11 #include "base/safe_strerror_posix.h" 11 #include "base/safe_strerror_posix.h"
12 #include "base/string_number_conversions.h" 12 #include "base/string_number_conversions.h"
13 #include "base/values.h" 13 #include "base/values.h"
14 #include "chrome/browser/browser_process.h" 14 #include "chrome/browser/browser_process.h"
15 #include "chrome/browser/certificate_viewer.h" 15 #include "chrome/browser/certificate_viewer.h"
16 #include "chrome/browser/chrome_select_file_policy.h"
16 #include "chrome/browser/ui/certificate_dialogs.h" 17 #include "chrome/browser/ui/certificate_dialogs.h"
17 #include "chrome/browser/ui/crypto_module_password_dialog.h" 18 #include "chrome/browser/ui/crypto_module_password_dialog.h"
18 #include "content/public/browser/browser_thread.h" 19 #include "content/public/browser/browser_thread.h"
19 #include "content/public/browser/web_contents.h" 20 #include "content/public/browser/web_contents.h"
20 #include "content/public/browser/web_contents_view.h" 21 #include "content/public/browser/web_contents_view.h"
21 #include "grit/generated_resources.h" 22 #include "grit/generated_resources.h"
22 #include "net/base/crypto_module.h" 23 #include "net/base/crypto_module.h"
23 #include "net/base/net_errors.h" 24 #include "net/base/net_errors.h"
24 #include "net/base/x509_certificate.h" 25 #include "net/base/x509_certificate.h"
25 #include "ui/base/l10n/l10n_util.h" 26 #include "ui/base/l10n/l10n_util.h"
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
560 SelectFileDialog::FileTypeInfo file_type_info; 561 SelectFileDialog::FileTypeInfo file_type_info;
561 file_type_info.extensions.resize(1); 562 file_type_info.extensions.resize(1);
562 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("p12")); 563 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("p12"));
563 file_type_info.extension_description_overrides.push_back( 564 file_type_info.extension_description_overrides.push_back(
564 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_PKCS12_FILES)); 565 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_PKCS12_FILES));
565 file_type_info.include_all_files = true; 566 file_type_info.include_all_files = true;
566 select_file_dialog_ = SelectFileDialog::Create(this); 567 select_file_dialog_ = SelectFileDialog::Create(this);
567 select_file_dialog_->SelectFile( 568 select_file_dialog_->SelectFile(
568 SelectFileDialog::SELECT_SAVEAS_FILE, string16(), 569 SelectFileDialog::SELECT_SAVEAS_FILE, string16(),
569 FilePath(), &file_type_info, 1, FILE_PATH_LITERAL("p12"), 570 FilePath(), &file_type_info, 1, FILE_PATH_LITERAL("p12"),
570 web_ui()->GetWebContents(), GetParentWindow(), 571 ChromeSelectFilePolicy::DisplayInfobarCallback(
572 web_ui()->GetWebContents()),
573 GetParentWindow(),
571 reinterpret_cast<void*>(EXPORT_PERSONAL_FILE_SELECTED)); 574 reinterpret_cast<void*>(EXPORT_PERSONAL_FILE_SELECTED));
572 } 575 }
573 576
574 void CertificateManagerHandler::ExportAllPersonal(const ListValue* args) { 577 void CertificateManagerHandler::ExportAllPersonal(const ListValue* args) {
575 NOTIMPLEMENTED(); 578 NOTIMPLEMENTED();
576 } 579 }
577 580
578 void CertificateManagerHandler::ExportPersonalFileSelected( 581 void CertificateManagerHandler::ExportPersonalFileSelected(
579 const FilePath& path) { 582 const FilePath& path) {
580 file_path_ = path; 583 file_path_ = path;
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 } 652 }
650 file_type_info.extensions.resize(1); 653 file_type_info.extensions.resize(1);
651 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("p12")); 654 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("p12"));
652 file_type_info.extension_description_overrides.push_back( 655 file_type_info.extension_description_overrides.push_back(
653 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_PKCS12_FILES)); 656 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_PKCS12_FILES));
654 file_type_info.include_all_files = true; 657 file_type_info.include_all_files = true;
655 select_file_dialog_ = SelectFileDialog::Create(this); 658 select_file_dialog_ = SelectFileDialog::Create(this);
656 select_file_dialog_->SelectFile( 659 select_file_dialog_->SelectFile(
657 SelectFileDialog::SELECT_OPEN_FILE, string16(), 660 SelectFileDialog::SELECT_OPEN_FILE, string16(),
658 FilePath(), &file_type_info, 1, FILE_PATH_LITERAL("p12"), 661 FilePath(), &file_type_info, 1, FILE_PATH_LITERAL("p12"),
659 web_ui()->GetWebContents(), GetParentWindow(), 662 ChromeSelectFilePolicy::DisplayInfobarCallback(
663 web_ui()->GetWebContents()),
664 GetParentWindow(),
660 reinterpret_cast<void*>(IMPORT_PERSONAL_FILE_SELECTED)); 665 reinterpret_cast<void*>(IMPORT_PERSONAL_FILE_SELECTED));
661 } 666 }
662 667
663 void CertificateManagerHandler::ImportPersonalFileSelected( 668 void CertificateManagerHandler::ImportPersonalFileSelected(
664 const FilePath& path) { 669 const FilePath& path) {
665 file_path_ = path; 670 file_path_ = path;
666 web_ui()->CallJavascriptFunction( 671 web_ui()->CallJavascriptFunction(
667 "CertificateManager.importPersonalAskPassword"); 672 "CertificateManager.importPersonalAskPassword");
668 } 673 }
669 674
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
1061 web_ui()->CallJavascriptFunction("CertificateManager.onCheckTpmTokenReady", 1066 web_ui()->CallJavascriptFunction("CertificateManager.onCheckTpmTokenReady",
1062 ready); 1067 ready);
1063 } 1068 }
1064 #endif 1069 #endif
1065 1070
1066 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const { 1071 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const {
1067 return web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow(); 1072 return web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow();
1068 } 1073 }
1069 1074
1070 } // namespace options2 1075 } // namespace options2
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698