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

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

Issue 10260016: Standardize formatting of certificate authority trust overlay. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix title of the certificate manager dialog. Created 8 years, 7 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/certificate_edit_ca_trust_overlay.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) 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"
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 321
322 // Personal Certificate Export overlay strings. 322 // Personal Certificate Export overlay strings.
323 localized_strings->SetString("certificateExportPasswordDescription", 323 localized_strings->SetString("certificateExportPasswordDescription",
324 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_EXPORT_PASSWORD_DESC)); 324 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_EXPORT_PASSWORD_DESC));
325 localized_strings->SetString("certificateExportPasswordHelp", 325 localized_strings->SetString("certificateExportPasswordHelp",
326 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_EXPORT_PASSWORD_HELP)); 326 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_EXPORT_PASSWORD_HELP));
327 localized_strings->SetString("certificateConfirmPasswordLabel", 327 localized_strings->SetString("certificateConfirmPasswordLabel",
328 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_CONFIRM_PASSWORD_LABEL)); 328 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_CONFIRM_PASSWORD_LABEL));
329 329
330 // Edit CA Trust & Import CA overlay strings. 330 // Edit CA Trust & Import CA overlay strings.
331 localized_strings->SetString("certificateEditCaTitle",
332 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_EDIT_CA_TITLE));
331 localized_strings->SetString("certificateEditTrustLabel", 333 localized_strings->SetString("certificateEditTrustLabel",
332 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_EDIT_TRUST_LABEL)); 334 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_EDIT_TRUST_LABEL));
333 localized_strings->SetString("certificateEditCaTrustDescriptionFormat", 335 localized_strings->SetString("certificateEditCaTrustDescriptionFormat",
334 l10n_util::GetStringUTF16( 336 l10n_util::GetStringUTF16(
335 IDS_CERT_MANAGER_EDIT_CA_TRUST_DESCRIPTION_FORMAT)); 337 IDS_CERT_MANAGER_EDIT_CA_TRUST_DESCRIPTION_FORMAT));
336 localized_strings->SetString("certificateImportCaDescriptionFormat", 338 localized_strings->SetString("certificateImportCaDescriptionFormat",
337 l10n_util::GetStringUTF16( 339 l10n_util::GetStringUTF16(
338 IDS_CERT_MANAGER_IMPORT_CA_DESCRIPTION_FORMAT)); 340 IDS_CERT_MANAGER_IMPORT_CA_DESCRIPTION_FORMAT));
339 localized_strings->SetString("certificateCaTrustSSLLabel", 341 localized_strings->SetString("certificateCaTrustSSLLabel",
340 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_EDIT_CA_TRUST_SSL_LABEL)); 342 l10n_util::GetStringUTF16(IDS_CERT_MANAGER_EDIT_CA_TRUST_SSL_LABEL));
(...skipping 704 matching lines...) Expand 10 before | Expand all | Expand 10 after
1045 web_ui()->CallJavascriptFunction("CertificateManager.onCheckTpmTokenReady", 1047 web_ui()->CallJavascriptFunction("CertificateManager.onCheckTpmTokenReady",
1046 ready); 1048 ready);
1047 } 1049 }
1048 #endif 1050 #endif
1049 1051
1050 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const { 1052 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const {
1051 return web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow(); 1053 return web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow();
1052 } 1054 }
1053 1055
1054 } // namespace options2 1056 } // namespace options2
OLDNEW
« no previous file with comments | « chrome/browser/resources/options2/certificate_edit_ca_trust_overlay.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698