MD Settings: Fix Client Navigations to Search Query URLs

chrome/browser/ui/chrome_pages.cc

 // Copyright (c) 2012 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/chrome_pages.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 26 matching lines @@
 #include "extensions/common/constants.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/base/url_util.h"
 #include "ui/base/window_open_disposition.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/win/enumerate_modules_model.h"
 #endif
 
 #if defined(OS_CHROMEOS)
+#include "base/feature_list.h"
 #include "chrome/browser/chromeos/genius_app/app_id.h"
+#include "chrome/common/chrome_features.h"
+#include "chrome/grit/generated_resources.h"
 #include "extensions/browser/extension_registry.h"
+#include "ui/base/l10n/l10n_util.h"
 #endif
 
 #if !defined(OS_ANDROID)
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "components/signin/core/browser/signin_manager.h"
 #endif
 
 using base::UserMetricsAction;
 
 namespace chrome {
@@ skipping 72 matching lines @@
   }
   ShowSingletonTab(browser, url);
 #endif
 }
 
 std::string GenerateContentSettingsExceptionsSubPage(ContentSettingsType type) {
   return kContentSettingsExceptionsSubPage + std::string(kHashMark) +
          site_settings::ContentSettingsTypeToGroupName(type);
 }
 
+#if defined(OS_CHROMEOS)
+std::string GenerateContentSettingsSearchQueryPath(int query_message_id) {
+  return std::string(chrome::kDeprecatedOptionsSearchSubPage) + kHashMark +
+         l10n_util::GetStringUTF8(query_message_id);
+}
+#endif
+
 }  // namespace
 
 void ShowBookmarkManager(Browser* browser) {
   content::RecordAction(UserMetricsAction("ShowBookmarkManager"));
   content::RecordAction(UserMetricsAction("ShowBookmarks"));
   ShowSingletonTabOverwritingNTP(
       browser,
       GetSingletonTabNavigateParams(browser, GURL(kChromeUIBookmarksURL)));
 }
 
@@ skipping 110 matching lines @@
 void ShowSettingsSubPage(Browser* browser, const std::string& sub_page) {
   if (::switches::SettingsWindowEnabled()) {
     ShowSettingsSubPageForProfile(browser->profile(), sub_page);
     return;
   }
   ShowSettingsSubPageInTabbedBrowser(browser, sub_page);
 }
 
 void ShowSettingsSubPageForProfile(Profile* profile,
                                    const std::string& sub_page) {
+  std::string sub_page_path = sub_page;
+
+#if defined(OS_CHROMEOS)
+  if (!base::FeatureList::IsEnabled(features::kMaterialDesignSettings)) {
+    if (sub_page == chrome::kAccessibilitySubPage) {
+      sub_page_path = GenerateContentSettingsSearchQueryPath(
+          IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY);
+    } else if (sub_page == chrome::kBluetoothSubPage) {
+      sub_page_path = GenerateContentSettingsSearchQueryPath(
+          IDS_OPTIONS_SETTINGS_SECTION_TITLE_BLUETOOTH);
+    } else if (sub_page == chrome::kDateTimeSubPage) {
+      sub_page_path = GenerateContentSettingsSearchQueryPath(
+          IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME);
+    }
+  }
+#endif
+
   if (::switches::SettingsWindowEnabled()) {
     content::RecordAction(base::UserMetricsAction("ShowOptions"));
     SettingsWindowManager::GetInstance()->ShowChromePageForProfile(
-        profile, GetSettingsUrl(sub_page));
+        profile, GetSettingsUrl(sub_page_path));
     return;
   }
   Browser* browser = chrome::FindTabbedBrowser(profile, false);
   if (!browser) {
     browser = new Browser(Browser::CreateParams(profile));
   }
-  ShowSettingsSubPageInTabbedBrowser(browser, sub_page);
+  ShowSettingsSubPageInTabbedBrowser(browser, sub_page_path);
 }
 
 void ShowSettingsSubPageInTabbedBrowser(Browser* browser,
                                         const std::string& sub_page) {
   content::RecordAction(UserMetricsAction("ShowOptions"));
   GURL gurl = GetSettingsUrl(sub_page);
   NavigateParams params(GetSingletonTabNavigateParams(browser, gurl));
   params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE;
   ShowSingletonTabOverwritingNTP(browser, params);
 }
@@ skipping 104 matching lines @@
       SigninManagerFactory::GetForProfile(original_profile);
   DCHECK(manager->IsSigninAllowed());
   if (manager->IsAuthenticated())
     ShowSettings(browser);
   else
     ShowBrowserSignin(browser, access_point);
 }
 #endif
 
 }  // namespace chrome