MD Settings: Fix Client Navigations to Search Query URLs

chrome/browser/ui/ash/system_tray_client.cc

 // Copyright 2016 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/ash/system_tray_client.h"
 
 #include "ash/common/login_status.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/feature_list.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
 #include "chrome/browser/chromeos/set_time_dialog.h"
 #include "chrome/browser/chromeos/system/system_clock.h"
 #include "chrome/browser/chromeos/ui/choose_mobile_network_dialog.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/browser/ui/singleton_tabs.h"
+#include "chrome/common/chrome_features.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/login/login_state.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/service_manager_connection.h"
 #include "net/base/escape.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "third_party/cros_system_api/dbus/shill/dbus-constants.h"
@@ skipping 96 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // ash::mojom::SystemTrayClient:
 
 void SystemTrayClient::ShowSettings() {
   ShowSettingsSubPageForActiveUser(std::string());
 }
 
 void SystemTrayClient::ShowDateSettings() {
   content::RecordAction(base::UserMetricsAction("ShowDateOptions"));
-  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);
+  }
   // Everybody can change the time zone (even though it is a device setting).
   chrome::ShowSettingsSubPageForProfile(ProfileManager::GetActiveUserProfile(),
                                         sub_page);
 }
 
 void SystemTrayClient::ShowSetTimeDialog() {
   chromeos::SetTimeDialog::ShowDialogInContainer(GetDialogParentContainerId());
 }
 
 void SystemTrayClient::ShowDisplaySettings() {
@@ skipping 23 matching lines @@
 }
 
 void SystemTrayClient::ShowAccessibilityHelp() {
   chrome::ScopedTabbedBrowserDisplayer displayer(
       ProfileManager::GetActiveUserProfile());
   chromeos::accessibility::ShowAccessibilityHelp(displayer.browser());
 }
 
 void SystemTrayClient::ShowAccessibilitySettings() {
   content::RecordAction(base::UserMetricsAction("ShowAccessibilitySettings"));
-  std::string sub_page = std::string(chrome::kSearchSubPage) + "#" +
-                         l10n_util::GetStringUTF8(
-                             IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY);
+  std::string sub_page;
+  if (base::FeatureList::IsEnabled(features::kMaterialDesignSettings)) {
+    sub_page = chrome::kAccessibilitySubPage;
+  } else {
+    sub_page = std::string(chrome::kDeprecatedOptionsSearchSubPage) + "#" +
+               l10n_util::GetStringUTF8(
+                   IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY);
+  }
   ShowSettingsSubPageForActiveUser(sub_page);
 }
 
 void SystemTrayClient::ShowPaletteHelp() {
   chrome::ScopedTabbedBrowserDisplayer displayer(
       ProfileManager::GetActiveUserProfile());
   chrome::ShowSingletonTab(displayer.browser(),
                            GURL(chrome::kChromePaletteHelpURL));
 }
 
@@ skipping 78 matching lines @@
     connector->ConnectToInterface("service:content_browser", &system_tray_);
 
   // Tolerate ash crashing and coming back up.
   system_tray_.set_connection_error_handler(base::Bind(
       &SystemTrayClient::OnClientConnectionError, base::Unretained(this)));
 }
 
 void SystemTrayClient::OnClientConnectionError() {
   system_tray_.reset();
 }