chrome/browser/ui/webui/settings/about_handler.cc - Issue 2029453002: MD Settings: About page, implement obsolete/end-of-the-line status.

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/settings/about_handler.cc

Issue 2029453002: MD Settings: About page, implement obsolete/end-of-the-line status. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressing comment. Created 4 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/resources/settings/about_page/about_page.js ('k') | chrome/test/data/webui/settings/about_page_tests.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/settings/about_handler.cc

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

index 1665cb4a0999ee6a86ab0796085ab59f437e9260..3b62a0f21af19f8b55909337f6a721f2cc02d55c 100644

--- a/chrome/browser/ui/webui/settings/about_handler.cc

+++ b/chrome/browser/ui/webui/settings/about_handler.cc

@@ -278,11 +278,15 @@ AboutHandler* AboutHandler::Create(content::WebUIDataSource* html_source,

base::ASCIIToUTF16(chrome::kChromeUICreditsURL));

html_source->AddString("aboutProductLicense", license);

- html_source->AddBoolean("aboutObsolteNowOrSoon",

+ html_source->AddBoolean("aboutObsoleteNowOrSoon",

ObsoleteSystem::IsObsoleteNowOrSoon());

- html_source->AddBoolean("aboutObsolteEndOfTheLine",

+ html_source->AddBoolean("aboutObsoleteEndOfTheLine",

ObsoleteSystem::IsObsoleteNowOrSoon() &&

ObsoleteSystem::IsEndOfTheLine());

+ html_source->AddString("aboutObsoleteSystem",

+ ObsoleteSystem::LocalizedObsoleteString());

+ html_source->AddString("aboutObsoleteSystemURL",

+ ObsoleteSystem::GetLinkURL());

#if defined(GOOGLE_CHROME_BUILD)

base::string16 tos = l10n_util::GetStringFUTF16(

« no previous file with comments | « chrome/browser/resources/settings/about_page/about_page.js ('k') | chrome/test/data/webui/settings/about_page_tests.js » ('j') | no next file with comments »