MD Settings: Fix Client Navigations to Search Query URLs

chrome/browser/interstitials/chrome_controller_client.cc

Index: chrome/browser/interstitials/chrome_controller_client.cc
diff --git a/chrome/browser/interstitials/chrome_controller_client.cc b/chrome/browser/interstitials/chrome_controller_client.cc
index 29cff458cadaedd7d454a12c3da03d64995ca5c9..699abdc38d2c71c4ab6306a114915429e7eb47ac 100644
--- a/chrome/browser/interstitials/chrome_controller_client.cc
+++ b/chrome/browser/interstitials/chrome_controller_client.cc
@@ -25,8 +25,10 @@
 #endif
 
 #if defined(OS_CHROMEOS)
+#include "base/feature_list.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/chrome_pages.h"
+#include "chrome/common/chrome_features.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -51,9 +53,14 @@ void LaunchDateAndTimeSettingsOnFile() {
   chrome::android::OpenDateAndTimeSettings();
 
 #elif defined(OS_CHROMEOS)
-  std::string sub_page =
-      std::string(chrome::kSearchSubPage) + "#" +
-      l10n_util::GetStringUTF8(IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME);
+  std::string sub_page;
+  if (base::FeatureList::IsEnabled(features::kMaterialDesignSettings)) {
+    sub_page = chrome::kDateTimeSubPage;
+  } else {
+    sub_page =
+        std::string(chrome::kDeprecatedOptionsSearchSubPage) + "#" +
+        l10n_util::GetStringUTF8(IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME);
+  }

[stevenjb, 2016/10/27 19:10:56]

Optional suggestion: Just use chrome::kDateTimeSubPage and move this logic to
chrome::ShowSettingsSubPageForProfile:

if (sub_page == chrome::kDateTimeSubPage &&
!base::FeatureList::IsEnabled(features::kMaterialDesignSettings))
  sub_page = std::string(chrome::kDeprecatedOptionsSearchSubPage) + "#"...

Then we can clean up all existing calls to chrome::ShowSettingsSubPageForProfile
and only have to remove the deprecated code in one place later.

[tommycli, 2016/10/27 21:03:50]

Done.

   chrome::ShowSettingsSubPageForProfile(ProfileManager::GetActiveUserProfile(),
                                         sub_page);