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

Unified Diff: chrome/browser/safe_browsing/safe_browsing_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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
===================================================================
--- chrome/browser/safe_browsing/safe_browsing_blocking_page.cc (revision 42180)
+++ chrome/browser/safe_browsing/safe_browsing_blocking_page.cc (working copy)
@@ -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 @@
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 @@
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 @@
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) {
« no previous file with comments | « chrome/browser/renderer_host/render_widget_host_view_win.cc ('k') | chrome/browser/search_engines/template_url.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698