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

Side by Side 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, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/settings/about_handler.h" 5 #include "chrome/browser/ui/webui/settings/about_handler.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 "aboutProductCopyright", 271 "aboutProductCopyright",
272 base::i18n::MessageFormatter::FormatWithNumberedArgs( 272 base::i18n::MessageFormatter::FormatWithNumberedArgs(
273 l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_COPYRIGHT), 273 l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_COPYRIGHT),
274 base::Time::Now())); 274 base::Time::Now()));
275 275
276 base::string16 license = l10n_util::GetStringFUTF16( 276 base::string16 license = l10n_util::GetStringFUTF16(
277 IDS_VERSION_UI_LICENSE, base::ASCIIToUTF16(chrome::kChromiumProjectURL), 277 IDS_VERSION_UI_LICENSE, base::ASCIIToUTF16(chrome::kChromiumProjectURL),
278 base::ASCIIToUTF16(chrome::kChromeUICreditsURL)); 278 base::ASCIIToUTF16(chrome::kChromeUICreditsURL));
279 html_source->AddString("aboutProductLicense", license); 279 html_source->AddString("aboutProductLicense", license);
280 280
281 html_source->AddBoolean("aboutObsolteNowOrSoon", 281 html_source->AddBoolean("aboutObsoleteNowOrSoon",
282 ObsoleteSystem::IsObsoleteNowOrSoon()); 282 ObsoleteSystem::IsObsoleteNowOrSoon());
283 html_source->AddBoolean("aboutObsolteEndOfTheLine", 283 html_source->AddBoolean("aboutObsoleteEndOfTheLine",
284 ObsoleteSystem::IsObsoleteNowOrSoon() && 284 ObsoleteSystem::IsObsoleteNowOrSoon() &&
285 ObsoleteSystem::IsEndOfTheLine()); 285 ObsoleteSystem::IsEndOfTheLine());
286 html_source->AddString("aboutObsoleteSystem",
287 ObsoleteSystem::LocalizedObsoleteString());
288 html_source->AddString("aboutObsoleteSystemURL",
289 ObsoleteSystem::GetLinkURL());
286 290
287 #if defined(GOOGLE_CHROME_BUILD) 291 #if defined(GOOGLE_CHROME_BUILD)
288 base::string16 tos = l10n_util::GetStringFUTF16( 292 base::string16 tos = l10n_util::GetStringFUTF16(
289 IDS_ABOUT_TERMS_OF_SERVICE, base::UTF8ToUTF16(chrome::kChromeUITermsURL)); 293 IDS_ABOUT_TERMS_OF_SERVICE, base::UTF8ToUTF16(chrome::kChromeUITermsURL));
290 html_source->AddString("aboutProductTos", tos); 294 html_source->AddString("aboutProductTos", tos);
291 #endif 295 #endif
292 296
293 #if defined(OS_CHROMEOS) 297 #if defined(OS_CHROMEOS)
294 base::string16 os_license = l10n_util::GetStringFUTF16( 298 base::string16 os_license = l10n_util::GetStringFUTF16(
295 IDS_ABOUT_CROS_VERSION_LICENSE, 299 IDS_ABOUT_CROS_VERSION_LICENSE,
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
653 std::string url = std::string("chrome://") + chrome::kChromeOSAssetHost + 657 std::string url = std::string("chrome://") + chrome::kChromeOSAssetHost +
654 "/" + path.MaybeAsASCII(); 658 "/" + path.MaybeAsASCII();
655 regulatory_info->SetString("url", url); 659 regulatory_info->SetString("url", url);
656 660
657 ResolveJavascriptCallback(base::StringValue(callback_id), *regulatory_info); 661 ResolveJavascriptCallback(base::StringValue(callback_id), *regulatory_info);
658 } 662 }
659 663
660 #endif // defined(OS_CHROMEOS) 664 #endif // defined(OS_CHROMEOS)
661 665
662 } // namespace settings 666 } // namespace settings
OLDNEW
« 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 »

Powered by Google App Engine
This is Rietveld 408576698