| Index: chrome/browser/ui/webui/settings/md_settings_ui.cc
|
| diff --git a/chrome/browser/ui/webui/settings/md_settings_ui.cc b/chrome/browser/ui/webui/settings/md_settings_ui.cc
|
| index 2846484261b5b9b23df52328713f1f52da0db380..fdabd2450a4e8eb4d7aa8daf5a532f4f9e1b2565 100644
|
| --- a/chrome/browser/ui/webui/settings/md_settings_ui.cc
|
| +++ b/chrome/browser/ui/webui/settings/md_settings_ui.cc
|
| @@ -8,6 +8,7 @@
|
|
|
| #include <string>
|
|
|
| +#include "base/feature_list.h"
|
| #include "base/metrics/histogram_macros.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/ui/webui/settings/about_handler.h"
|
| @@ -25,6 +26,7 @@
|
| #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h"
|
| #include "chrome/browser/ui/webui/settings/settings_startup_pages_handler.h"
|
| #include "chrome/browser/ui/webui/settings/site_settings_handler.h"
|
| +#include "chrome/common/chrome_features.h"
|
| #include "chrome/common/url_constants.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "content/public/browser/web_ui.h"
|
| @@ -82,8 +84,13 @@ MdSettingsUI::MdSettingsUI(content::WebUI* web_ui)
|
| AddSettingsPageUIHandler(new SystemHandler());
|
| #endif
|
|
|
| + // Host must be derived from the visible URL, since this might be serving
|
| + // either chrome://settings or chrome://md-settings.
|
| + const GURL url = web_ui->GetWebContents()->GetVisibleURL();
|
| + CHECK(url.GetOrigin() == GURL(chrome::kChromeUISettingsURL).GetOrigin() ||
|
| + url.GetOrigin() == GURL(chrome::kChromeUIMdSettingsURL).GetOrigin());
|
| content::WebUIDataSource* html_source =
|
| - content::WebUIDataSource::Create(chrome::kChromeUIMdSettingsHost);
|
| + content::WebUIDataSource::Create(url.host());
|
|
|
| #if defined(OS_CHROMEOS)
|
| chromeos::settings::EasyUnlockSettingsHandler* easy_unlock_handler =
|
|
|