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/safe_browsing/safe_browsing_blocking_page.cc | |
| 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/safe_browsing/safe_browsing_blocking_page.cc')
| -rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_blocking_page.cc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc index d37c6ce..f5ef76e 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc @@ -11,6 +11,7 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/histogram.h" +#include "base/i18n/rtl.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/chrome_thread.h" @@ -238,9 +239,7 @@ void SafeBrowsingBlockingPage::PopulateMultipleThreatStringDictionary( l10n_util::GetString(IDS_SAFE_BROWSING_MALWARE_PROCEED_BUTTON)); strings->SetString(L"back_button", l10n_util::GetString(IDS_SAFE_BROWSING_MALWARE_BACK_BUTTON)); - 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"); } void SafeBrowsingBlockingPage::PopulateMalwareStringDictionary( @@ -280,9 +279,7 @@ void SafeBrowsingBlockingPage::PopulateMalwareStringDictionary( l10n_util::GetString(IDS_SAFE_BROWSING_MALWARE_PROCEED_BUTTON)); strings->SetString(L"back_button", l10n_util::GetString(IDS_SAFE_BROWSING_MALWARE_BACK_BUTTON)); - 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"); } void SafeBrowsingBlockingPage::PopulatePhishingStringDictionary( @@ -303,9 +300,7 @@ void SafeBrowsingBlockingPage::PopulatePhishingStringDictionary( l10n_util::GetString(IDS_SAFE_BROWSING_PHISHING_BACK_BUTTON)); strings->SetString(L"report_error", l10n_util::GetString(IDS_SAFE_BROWSING_PHISHING_REPORT_ERROR)); - 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"); } void SafeBrowsingBlockingPage::CommandReceived(const std::string& cmd) { |