diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-27 12:48:26 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-27 11:11:56 +0000 |
| commit | c69fdae9c762b7bdf45016bf8398f6050b7699ba (patch) | |
| tree | 7f95460374822dbb18bba1f0bad1c09a1427c8a5 /chromium/chrome/browser/ui/webui/settings | |
| parent | 2a19c63448c84c1805fb1a585c3651318bb86ca7 (diff) | |
BASELINE: Update Chromium to 69.0.3497.113
Change-Id: I4fb3f077682cc7eda51e9046981dcd40e0183cd6
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/chrome/browser/ui/webui/settings')
| -rw-r--r-- | chromium/chrome/browser/ui/webui/settings/about_handler.cc | 3 | ||||
| -rw-r--r-- | chromium/chrome/browser/ui/webui/settings/chromeos/account_manager_handler.cc | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/chromium/chrome/browser/ui/webui/settings/about_handler.cc b/chromium/chrome/browser/ui/webui/settings/about_handler.cc index 067049dbd29..6a343a20086 100644 --- a/chromium/chrome/browser/ui/webui/settings/about_handler.cc +++ b/chromium/chrome/browser/ui/webui/settings/about_handler.cc @@ -324,7 +324,8 @@ AboutHandler* AboutHandler::Create(content::WebUIDataSource* html_source, html_source->AddString("aboutProductOsLicense", os_license); base::string16 os_with_linux_license = l10n_util::GetStringFUTF16( IDS_ABOUT_CROS_WITH_LINUX_VERSION_LICENSE, - base::ASCIIToUTF16(chrome::kChromeUIOSCreditsURL)); + base::ASCIIToUTF16(chrome::kChromeUIOSCreditsURL), + base::ASCIIToUTF16(chrome::kChromeUILinuxCreditsURL)); html_source->AddString("aboutProductOsWithLinuxLicense", os_with_linux_license); html_source->AddBoolean("aboutEnterpriseManaged", IsEnterpriseManaged()); diff --git a/chromium/chrome/browser/ui/webui/settings/chromeos/account_manager_handler.cc b/chromium/chrome/browser/ui/webui/settings/chromeos/account_manager_handler.cc index 46968303b50..66d0c0748cd 100644 --- a/chromium/chrome/browser/ui/webui/settings/chromeos/account_manager_handler.cc +++ b/chromium/chrome/browser/ui/webui/settings/chromeos/account_manager_handler.cc @@ -160,6 +160,10 @@ void AccountManagerUIHandler::OnAccountRemoved(const AccountInfo& account_key) { } void AccountManagerUIHandler::RefreshUI() { + if (!IsJavascriptAllowed()) { + return; + } + FireWebUIListener("accounts-changed"); } |