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

Unified Diff: chrome/browser/browser_about_handler.cc

Issue 523153: Make about:plugin page get rendered properly in Hebrew and Arabic Chrome.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 11 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/browser_about_handler.cc
===================================================================
--- chrome/browser/browser_about_handler.cc (revision 35468)
+++ chrome/browser/browser_about_handler.cc (working copy)
@@ -357,11 +357,13 @@
localized_strings.SetString(L"enabled_no",
l10n_util::GetString(IDS_ABOUT_PLUGINS_ENABLED_NO));
+ ChromeURLDataManager::DataSource::SetFontAndTextDirection(&localized_strings);
+
static const base::StringPiece plugins_html(
ResourceBundle::GetSharedInstance().GetRawDataResource(
IDR_ABOUT_PLUGINS_HTML));
- return jstemplate_builder::GetTemplateHtml(
+ return jstemplate_builder::GetTemplatesHtml(
plugins_html, &localized_strings, "t" /* template root node id */);
}
@@ -496,14 +498,13 @@
return std::string();
}
- std::wstring webkit_version = UTF8ToWide(webkit_glue::GetWebKitVersion());
+ std::string webkit_version = webkit_glue::GetWebKitVersion();
#ifdef CHROME_V8
- const char* v8_vers = v8::V8::GetVersion();
- std::wstring js_version = UTF8ToWide(v8_vers);
- std::wstring js_engine = L"V8";
+ std::string js_version(v8::V8::GetVersion());
+ std::string js_engine = "V8";
#else
- std::wstring js_version = webkit_version;
- std::wstring js_engine = L"JavaScriptCore";
+ std::string js_version = webkit_version;
+ std::string js_engine = "JavaScriptCore";
#endif
localized_strings->SetString(L"name",
@@ -526,20 +527,14 @@
localized_strings->SetString(L"official",
l10n_util::GetString(IDS_ABOUT_VERSION_UNOFFICIAL));
}
- localized_strings->SetString(L"useragent",
- UTF8ToWide(webkit_glue::GetUserAgent(GURL())));
+ localized_strings->SetString(L"useragent", webkit_glue::GetUserAgent(GURL()));
static const std::string version_html(
ResourceBundle::GetSharedInstance().GetDataResource(
IDR_ABOUT_VERSION_HTML));
- std::string output = version_html;
- jstemplate_builder::AppendJsonHtml(localized_strings, &output);
- jstemplate_builder::AppendI18nTemplateSourceHtml(&output);
- jstemplate_builder::AppendI18nTemplateProcessHtml(&output);
- jstemplate_builder::AppendJsTemplateSourceHtml(&output);
- jstemplate_builder::AppendJsTemplateProcessHtml("t", &output);
- return output;
+ return jstemplate_builder::GetTemplatesHtml(
arv (Not doing code reviews) 2010/01/08 00:25:48 Actually, I would prefer if we kept it the old way
+ version_html, localized_strings, "t" /* template root node id */);
}
static void AddBoolSyncDetail(ListValue* details, const std::wstring& stat_name,
« no previous file with comments | « no previous file | chrome/browser/resources/about_plugins.html » ('j') | chrome/browser/resources/about_plugins.html » ('J')

Powered by Google App Engine
This is Rietveld 408576698