chrome/browser/ui/webui/conflicts_ui.cc - Issue 599653003: Remove old template html boilerplate

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/conflicts_ui.cc

Issue 599653003: Remove old template html boilerplate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bydefault

Patch Set: . Created 6 years, 3 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/conflicts_ui.cc

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

index 24f5ea1db18a4cbe6d26b5963ee45b0df1a2838c..39f10aedcff628692120644cc6b82f8435b4a1af 100644

--- a/chrome/browser/ui/webui/conflicts_ui.cc

+++ b/chrome/browser/ui/webui/conflicts_ui.cc

@@ -45,7 +45,6 @@ content::WebUIDataSource* CreateConflictsUIHTMLSource() {

content::WebUIDataSource* source =

content::WebUIDataSource::Create(chrome::kChromeUIConflictsHost);

- source->SetUseJsonJSFormatV2();

source->AddLocalizedString("loadingMessage", IDS_CONFLICTS_LOADING_MESSAGE);

source->AddLocalizedString("modulesLongTitle",

IDS_CONFLICTS_CHECK_PAGE_TITLE_LONG);