Commit 0cf48f61 authored by dpapad's avatar dpapad Committed by Commit Bot

Settings: Remove unnecessary GetHelpUrlWithBoard() helper.

This function attached a parameter to help URLs on ChromeOS which could
potentially display different help content based an a CrOS device's
board info. This is not relevant after the OS/Browser settings split,
since device specific settings no longer reside in chrome://settings.

Bug: None
Change-Id: I574a56ef9c36d0d05b75d448951371d7b352352c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2165847
Auto-Submit: dpapad <dpapad@chromium.org>
Commit-Queue: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#762487}
parent 7288749b
......@@ -80,7 +80,6 @@
#if defined(OS_CHROMEOS)
#include "ash/public/cpp/ash_switches.h"
#include "base/system/sys_info.h"
#include "chrome/browser/chromeos/account_manager/account_manager_util.h"
#include "chrome/browser/chromeos/assistant/assistant_util.h"
#include "chrome/browser/chromeos/kerberos/kerberos_credentials_manager.h"
......@@ -116,16 +115,6 @@
namespace settings {
namespace {
#if defined(OS_CHROMEOS)
// Generates a Google Help URL which includes a "board type" parameter. Some
// help pages need to be adjusted depending on the type of CrOS device that is
// accessing the page.
base::string16 GetHelpUrlWithBoard(const std::string& original_url) {
return base::ASCIIToUTF16(original_url +
"&b=" + base::SysInfo::GetLsbReleaseBoard());
}
#endif
void AddCommonStrings(content::WebUIDataSource* html_source, Profile* profile) {
static constexpr webui::LocalizedString kLocalizedStrings[] = {
{"add", IDS_ADD},
......@@ -1267,11 +1256,7 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
"doNotTrackDialogMessage",
l10n_util::GetStringFUTF16(
IDS_SETTINGS_ENABLE_DO_NOT_TRACK_DIALOG_TEXT,
#if defined(OS_CHROMEOS)
GetHelpUrlWithBoard(chrome::kDoNotTrackLearnMoreURL)));
#else
base::ASCIIToUTF16(chrome::kDoNotTrackLearnMoreURL)));
#endif
html_source->AddString(
"exceptionsLearnMoreURL",
base::ASCIIToUTF16(chrome::kContentSettingsExceptionsLearnMoreURL));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment