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

Side by Side Diff: chrome/browser/ssl/ssl_blocking_page.cc

Issue 1073005: Move RTL related functions from app/l10n_util to base/i18n/rtl... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 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
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/ssl/ssl_blocking_page.h" 5 #include "chrome/browser/ssl/ssl_blocking_page.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "base/histogram.h" 9 #include "base/histogram.h"
10 #include "base/i18n/rtl.h"
10 #include "base/string_piece.h" 11 #include "base/string_piece.h"
11 #include "base/values.h" 12 #include "base/values.h"
12 #include "chrome/browser/browser.h" 13 #include "chrome/browser/browser.h"
13 #include "chrome/browser/cert_store.h" 14 #include "chrome/browser/cert_store.h"
14 #include "chrome/browser/dom_operation_notification_details.h" 15 #include "chrome/browser/dom_operation_notification_details.h"
15 #include "chrome/browser/pref_service.h" 16 #include "chrome/browser/pref_service.h"
16 #include "chrome/browser/renderer_host/render_process_host.h" 17 #include "chrome/browser/renderer_host/render_process_host.h"
17 #include "chrome/browser/renderer_host/render_view_host.h" 18 #include "chrome/browser/renderer_host/render_view_host.h"
18 #include "chrome/browser/ssl/ssl_cert_error_handler.h" 19 #include "chrome/browser/ssl/ssl_cert_error_handler.h"
19 #include "chrome/browser/ssl/ssl_error_info.h" 20 #include "chrome/browser/ssl/ssl_error_info.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 72
72 strings.SetString(L"moreInfoTitle", 73 strings.SetString(L"moreInfoTitle",
73 l10n_util::GetString(IDS_CERT_ERROR_EXTRA_INFO_TITLE)); 74 l10n_util::GetString(IDS_CERT_ERROR_EXTRA_INFO_TITLE));
74 SetExtraInfo(&strings, error_info.extra_information()); 75 SetExtraInfo(&strings, error_info.extra_information());
75 76
76 strings.SetString(L"proceed", 77 strings.SetString(L"proceed",
77 l10n_util::GetString(IDS_SSL_BLOCKING_PAGE_PROCEED)); 78 l10n_util::GetString(IDS_SSL_BLOCKING_PAGE_PROCEED));
78 strings.SetString(L"exit", 79 strings.SetString(L"exit",
79 l10n_util::GetString(IDS_SSL_BLOCKING_PAGE_EXIT)); 80 l10n_util::GetString(IDS_SSL_BLOCKING_PAGE_EXIT));
80 81
81 strings.SetString(L"textdirection", 82 strings.SetString(L"textdirection", base::i18n::IsRTL() ? L"rtl" : L"ltr");
82 (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT) ?
83 L"rtl" : L"ltr");
84 83
85 static const base::StringPiece html( 84 static const base::StringPiece html(
86 ResourceBundle::GetSharedInstance().GetRawDataResource( 85 ResourceBundle::GetSharedInstance().GetRawDataResource(
87 IDR_SSL_ROAD_BLOCK_HTML)); 86 IDR_SSL_ROAD_BLOCK_HTML));
88 87
89 return jstemplate_builder::GetI18nTemplateHtml(html, &strings); 88 return jstemplate_builder::GetI18nTemplateHtml(html, &strings);
90 } 89 }
91 90
92 void SSLBlockingPage::UpdateEntry(NavigationEntry* entry) { 91 void SSLBlockingPage::UpdateEntry(NavigationEntry* entry) {
93 const net::SSLInfo& ssl_info = handler_->ssl_info(); 92 const net::SSLInfo& ssl_info = handler_->ssl_info();
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 L"moreInfo1", L"moreInfo2", L"moreInfo3", L"moreInfo4", L"moreInfo5" 151 L"moreInfo1", L"moreInfo2", L"moreInfo3", L"moreInfo4", L"moreInfo5"
153 }; 152 };
154 int i; 153 int i;
155 for (i = 0; i < static_cast<int>(extra_info.size()); i++) { 154 for (i = 0; i < static_cast<int>(extra_info.size()); i++) {
156 strings->SetString(keys[i], extra_info[i]); 155 strings->SetString(keys[i], extra_info[i]);
157 } 156 }
158 for (;i < 5; i++) { 157 for (;i < 5; i++) {
159 strings->SetString(keys[i], L""); 158 strings->SetString(keys[i], L"");
160 } 159 }
161 } 160 }
OLDNEW
« no previous file with comments | « chrome/browser/search_engines/template_url_table_model.cc ('k') | chrome/browser/ssl/ssl_policy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698