chrome/browser/ui/webui/options2/options_ui2.cc - Issue 10391044: retry 136193 - convert localStrings to loadTimeData for options page

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/options2/options_ui2.cc

Issue 10391044: retry 136193 - convert localStrings to loadTimeData for options page (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: sync Created 8 years, 7 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:

Index: chrome/browser/ui/webui/options2/options_ui2.cc

diff --git a/chrome/browser/ui/webui/options2/options_ui2.cc b/chrome/browser/ui/webui/options2/options_ui2.cc

index 63f9c1ad358e9fd8fd644aa18fd57a97ce8a7ea5..33b13b795e082010f7f43ce03aaacb6165a217f1 100644

--- a/chrome/browser/ui/webui/options2/options_ui2.cc

+++ b/chrome/browser/ui/webui/options2/options_ui2.cc

@@ -142,6 +142,7 @@ void OptionsUIHTMLSource::StartDataRequest(const std::string& path,

if (path == kLocalizedStringsFile) {

// Return dynamically-generated strings from memory.

+ jstemplate_builder::UseVersion2 version;

std::string strings_js;

jstemplate_builder::AppendJsonJS(localized_strings_.get(), &strings_js);

response_bytes = base::RefCountedString::TakeString(&strings_js);