diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-20 06:37:01 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-20 06:37:01 +0000 |
| commit | 7cf1b6ced3b14cce1d66ca0ddc713851f0d37536 (patch) | |
| tree | 1c2fc9f4d52bf3046addf820d5eec03a2e150749 /chrome/browser/ssl | |
| parent | f9f4841b14a9f309ce5ee613f0d4de6afad88767 (diff) | |
| download | chromium_src-7cf1b6ced3b14cce1d66ca0ddc713851f0d37536.zip chromium_src-7cf1b6ced3b14cce1d66ca0ddc713851f0d37536.tar.gz chromium_src-7cf1b6ced3b14cce1d66ca0ddc713851f0d37536.tar.bz2 | |
Move RTL related functions from app/l10n_util to base/i18n/rtl
TBR=darin
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1073005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42182 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl')
| -rw-r--r-- | chrome/browser/ssl/ssl_blocking_page.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/ssl/ssl_policy.cc | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc index 0746d61..904c083 100644 --- a/chrome/browser/ssl/ssl_blocking_page.cc +++ b/chrome/browser/ssl/ssl_blocking_page.cc @@ -7,6 +7,7 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/histogram.h" +#include "base/i18n/rtl.h" #include "base/string_piece.h" #include "base/values.h" #include "chrome/browser/browser.h" @@ -78,9 +79,7 @@ std::string SSLBlockingPage::GetHTMLContents() { strings.SetString(L"exit", l10n_util::GetString(IDS_SSL_BLOCKING_PAGE_EXIT)); - strings.SetString(L"textdirection", - (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT) ? - L"rtl" : L"ltr"); + strings.SetString(L"textdirection", base::i18n::IsRTL() ? L"rtl" : L"ltr"); static const base::StringPiece html( ResourceBundle::GetSharedInstance().GetRawDataResource( diff --git a/chrome/browser/ssl/ssl_policy.cc b/chrome/browser/ssl/ssl_policy.cc index 0612558..2f21e5d 100644 --- a/chrome/browser/ssl/ssl_policy.cc +++ b/chrome/browser/ssl/ssl_policy.cc @@ -8,6 +8,7 @@ #include "app/resource_bundle.h" #include "base/base_switches.h" #include "base/command_line.h" +#include "base/i18n/rtl.h" #include "base/singleton.h" #include "base/string_piece.h" #include "base/string_util.h" @@ -218,9 +219,7 @@ void SSLPolicy::ShowErrorPage(SSLCertErrorHandler* handler) { strings.SetString(L"back", l10n_util::GetString(IDS_SSL_ERROR_PAGE_BACK)); - strings.SetString(L"textdirection", - (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT) ? - L"rtl" : L"ltr"); + strings.SetString(L"textdirection", base::i18n::IsRTL() ? L"rtl" : L"ltr"); static const base::StringPiece html( ResourceBundle::GetSharedInstance().GetRawDataResource( |