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

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

Issue 6592079: [ChromeOS] Add strings and UI placeholder for hardware-backed key. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more generic name format Created 9 years, 9 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/options/certificate_manager.html ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/file_util.h" // for FileAccessProvider 7 #include "base/file_util.h" // for FileAccessProvider
8 #include "base/safe_strerror_posix.h" 8 #include "base/safe_strerror_posix.h"
9 #include "base/scoped_vector.h" 9 #include "base/scoped_vector.h"
10 #include "base/string_number_conversions.h" 10 #include "base/string_number_conversions.h"
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 l10n_util::GetStringUTF16( 334 l10n_util::GetStringUTF16(
335 IDS_CERT_MANAGER_IMPORT_CA_DESCRIPTION_FORMAT)); 335 IDS_CERT_MANAGER_IMPORT_CA_DESCRIPTION_FORMAT));
336 localized_strings->SetString("certificateCaTrustSSLLabel", 336 localized_strings->SetString("certificateCaTrustSSLLabel",
337 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_EDIT_CA_TRUST_SSL_LABEL)); 337 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_EDIT_CA_TRUST_SSL_LABEL));
338 localized_strings->SetString("certificateCaTrustEmailLabel", 338 localized_strings->SetString("certificateCaTrustEmailLabel",
339 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_EDIT_CA_TRUST_EMAIL_LABEL)); 339 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_EDIT_CA_TRUST_EMAIL_LABEL));
340 localized_strings->SetString("certificateCaTrustObjSignLabel", 340 localized_strings->SetString("certificateCaTrustObjSignLabel",
341 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_EDIT_CA_TRUST_OBJSIGN_LABEL)); 341 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_EDIT_CA_TRUST_OBJSIGN_LABEL));
342 localized_strings->SetString("certificateImportErrorFormat", 342 localized_strings->SetString("certificateImportErrorFormat",
343 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_IMPORT_ERROR_FORMAT)); 343 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_IMPORT_ERROR_FORMAT));
344
345 #if defined(OS_CHROMEOS)
346 localized_strings->SetString("importAndBindCertificate",
347 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_IMPORT_AND_BIND_BUTTON));
348 localized_strings->SetString("hardwareBackedKeyFormat",
349 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_HARDWARE_BACKED_KEY_FORMAT));
350 localized_strings->SetString("chromeOSDeviceName",
351 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_HARDWARE_BACKED));
352 #endif // defined(OS_CHROMEOS)
344 } 353 }
345 354
346 void CertificateManagerHandler::RegisterMessages() { 355 void CertificateManagerHandler::RegisterMessages() {
347 web_ui_->RegisterMessageCallback("viewCertificate", 356 web_ui_->RegisterMessageCallback("viewCertificate",
348 NewCallback(this, &CertificateManagerHandler::View)); 357 NewCallback(this, &CertificateManagerHandler::View));
349 358
350 web_ui_->RegisterMessageCallback("getCaCertificateTrust", 359 web_ui_->RegisterMessageCallback("getCaCertificateTrust",
351 NewCallback(this, &CertificateManagerHandler::GetCATrust)); 360 NewCallback(this, &CertificateManagerHandler::GetCATrust));
352 web_ui_->RegisterMessageCallback("editCaCertificateTrust", 361 web_ui_->RegisterMessageCallback("editCaCertificateTrust",
353 NewCallback(this, &CertificateManagerHandler::EditCATrust)); 362 NewCallback(this, &CertificateManagerHandler::EditCATrust));
(...skipping 574 matching lines...) Expand 10 before | Expand all | Expand 10 after
928 StringValue error_value(error); 937 StringValue error_value(error);
929 web_ui_->CallJavascriptFunction(L"CertificateImportErrorOverlay.show", 938 web_ui_->CallJavascriptFunction(L"CertificateImportErrorOverlay.show",
930 title_value, 939 title_value,
931 error_value, 940 error_value,
932 cert_error_list); 941 cert_error_list);
933 } 942 }
934 943
935 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const { 944 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const {
936 return web_ui_->tab_contents()->view()->GetTopLevelNativeWindow(); 945 return web_ui_->tab_contents()->view()->GetTopLevelNativeWindow();
937 } 946 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/certificate_manager.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698