[MD Settings] Add feature to enable md-settings by default.

chrome/browser/ui/webui/settings/md_settings_ui.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/settings/md_settings_ui.h"
 
 #include <stddef.h>
 
 #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"
 #include "chrome/browser/ui/webui/settings/appearance_handler.h"
 #include "chrome/browser/ui/webui/settings/downloads_handler.h"
 #include "chrome/browser/ui/webui/settings/font_handler.h"
 #include "chrome/browser/ui/webui/settings/languages_handler.h"
 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.h"
 #include "chrome/browser/ui/webui/settings/people_handler.h"
 #include "chrome/browser/ui/webui/settings/profile_info_handler.h"
 #include "chrome/browser/ui/webui/settings/reset_settings_handler.h"
 #include "chrome/browser/ui/webui/settings/search_engines_handler.h"
 #include "chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h"
 #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"
 #include "content/public/browser/web_ui_data_source.h"
 #include "grit/settings_resources.h"
 #include "grit/settings_resources_map.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h"
 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h"
@@ skipping 36 matching lines @@
 
 #if defined(OS_CHROMEOS)
   AddSettingsPageUIHandler(new chromeos::settings::ChangePictureHandler());
   AddSettingsPageUIHandler(new chromeos::settings::KeyboardHandler(web_ui));
 #else
   AddSettingsPageUIHandler(new DefaultBrowserHandler(web_ui));
   AddSettingsPageUIHandler(new ManageProfileHandler(profile));
   AddSettingsPageUIHandler(new SystemHandler());
 #endif
 
+  std::string html_host = chrome::kChromeUIMdSettingsHost;

[groby-ooo-7-16, 2016/06/01 20:46:30]

Ugly, but necessary - since we use relative URLs, we'll need to root this at
chrome://settings if we serve from chrome://settings

So, the question is - do we still want to have chrome://md-settings around when
we enable MD from chrome://settings? The CL currently is halfway between. My
inclination is to say "no, let's just serve from one URL", but that's not quite
what we discussed on the previous CL. LMK

+  if (base::FeatureList::IsEnabled(features::kMaterialDesignSettingsFeature))
+    html_host = chrome::kChromeUISettingsHost;
   content::WebUIDataSource* html_source =
-      content::WebUIDataSource::Create(chrome::kChromeUIMdSettingsHost);
+      content::WebUIDataSource::Create(html_host);

[Dan Beam, 2016/06/01 20:52:57]

instead of |html_host|, could this web web_ui->GetURL().host()?

[Dan Beam, 2016/06/01 21:01:09]

web_ui->GetWebContents()->GetVisibleUrl().host() **

[groby-ooo-7-16, 2016/06/01 23:29:35]

Hm. I wonder if that could exploit routing problems (since now *any* URL that
manages to reach the handler will give whatever URL is currently visible
access.) 

[groby-ooo-7-16, 2016/06/02 23:03:53]

Tentatively done. Still feeling queasy about it.

 
 #if defined(OS_CHROMEOS)
   chromeos::settings::EasyUnlockSettingsHandler* easy_unlock_handler =
       chromeos::settings::EasyUnlockSettingsHandler::Create(html_source,
                                                             profile);
   if (easy_unlock_handler)
     AddSettingsPageUIHandler(easy_unlock_handler);
 #endif
 
   AddSettingsPageUIHandler(AboutHandler::Create(html_source, profile));
@@ skipping 34 matching lines @@
   UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD",
                       base::Time::Now() - load_start_time_);
 }
 
 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() {
   UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD",
                       base::Time::Now() - load_start_time_);
 }
 
 }  // namespace settings