MD Settings: Fix Client Navigations to Search Query URLs

chrome/browser/interstitials/chrome_controller_client.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/interstitials/chrome_controller_client.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/process/launch.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/interstitials/chrome_metrics_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "components/safe_browsing_db/safe_browsing_prefs.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/referrer.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/android/intent_helper.h"
 #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"
 #endif
 
 #if defined(OS_WIN)
 #include "base/base_paths_win.h"
 #include "base/path_service.h"
 #include "base/strings/string16.h"
 #include "base/win/windows_version.h"
 #endif
 
 using content::Referrer;
 
 namespace {
 
 void LaunchDateAndTimeSettingsOnFile() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
 // The code for each OS is completely separate, in order to avoid bugs like
 // https://crbug.com/430877 .
 #if defined(OS_ANDROID)
   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);
 
 #elif defined(OS_LINUX)
   struct ClockCommand {
     const char* pathname;
     const char* argument;
   };
   static const ClockCommand kClockCommands[] = {
       // Unity
@@ skipping 114 matching lines @@
 
 PrefService* ChromeControllerClient::GetPrefService() {
   Profile* profile =
       Profile::FromBrowserContext(web_contents_->GetBrowserContext());
   return profile->GetPrefs();
 }
 
 const std::string ChromeControllerClient::GetExtendedReportingPrefName() {
   return safe_browsing::GetExtendedReportingPrefName(*GetPrefService());
 }