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

Side by Side Diff: chrome/browser/ui/webui/settings/about_handler.cc

Issue 2007733002: MD Settings: About page, display product info. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove top margin. 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/resources/settings/about_page/about_page.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
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("aboutObsolteNowOrSoon",
282 ObsoleteSystem::IsObsoleteNowOrSoon()); 282 ObsoleteSystem::IsObsoleteNowOrSoon());
283 html_source->AddBoolean("aboutObsolteEndOfTheLine", 283 html_source->AddBoolean("aboutObsolteEndOfTheLine",
284 ObsoleteSystem::IsObsoleteNowOrSoon() && 284 ObsoleteSystem::IsObsoleteNowOrSoon() &&
285 ObsoleteSystem::IsEndOfTheLine()); 285 ObsoleteSystem::IsEndOfTheLine());
286 286
287 #if defined(GOOGLE_CHROME_BUILD)
288 base::string16 tos = l10n_util::GetStringFUTF16(
289 IDS_ABOUT_TERMS_OF_SERVICE, base::UTF8ToUTF16(chrome::kChromeUITermsURL));
290 html_source->AddString("aboutProductTos", tos);
291 #endif
292
287 #if defined(OS_CHROMEOS) 293 #if defined(OS_CHROMEOS)
288 base::string16 os_license = l10n_util::GetStringFUTF16( 294 base::string16 os_license = l10n_util::GetStringFUTF16(
289 IDS_ABOUT_CROS_VERSION_LICENSE, 295 IDS_ABOUT_CROS_VERSION_LICENSE,
290 base::ASCIIToUTF16(chrome::kChromeUIOSCreditsURL)); 296 base::ASCIIToUTF16(chrome::kChromeUIOSCreditsURL));
291 html_source->AddString("aboutProductOsLicense", os_license); 297 html_source->AddString("aboutProductOsLicense", os_license);
292 298
293 html_source->AddBoolean("aboutCanChangeChannel", CanChangeChannel(profile)); 299 html_source->AddBoolean("aboutCanChangeChannel", CanChangeChannel(profile));
294 html_source->AddBoolean("aboutEnterpriseManaged", IsEnterpriseManaged()); 300 html_source->AddBoolean("aboutEnterpriseManaged", IsEnterpriseManaged());
295 301
296 base::Time build_time = base::SysInfo::GetLsbReleaseTime(); 302 base::Time build_time = base::SysInfo::GetLsbReleaseTime();
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
647 std::string url = std::string("chrome://") + chrome::kChromeOSAssetHost + 653 std::string url = std::string("chrome://") + chrome::kChromeOSAssetHost +
648 "/" + path.MaybeAsASCII(); 654 "/" + path.MaybeAsASCII();
649 regulatory_info->SetString("url", url); 655 regulatory_info->SetString("url", url);
650 656
651 ResolveJavascriptCallback(base::StringValue(callback_id), *regulatory_info); 657 ResolveJavascriptCallback(base::StringValue(callback_id), *regulatory_info);
652 } 658 }
653 659
654 #endif // defined(OS_CHROMEOS) 660 #endif // defined(OS_CHROMEOS)
655 661
656 } // namespace settings 662 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/about_page/about_page.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698