MD Settings: Update Content Settings Types 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/feature_list.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/extensions/launch_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_navigator_params.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/extensions/app_launch_params.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/browser/ui/settings_window_manager.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/options/content_settings_handler.h"
 #include "chrome/browser/ui/webui/site_settings_helper.h"
+#include "chrome/common/chrome_features.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "components/signin/core/browser/signin_header_helper.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/common/constants.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/base/url_util.h"
@@ skipping 91 matching lines @@
   std::unique_ptr<ScopedTabbedBrowserDisplayer> displayer;
   if (!browser) {
     displayer.reset(new ScopedTabbedBrowserDisplayer(profile));
     browser = displayer->browser();
   }
   ShowSingletonTab(browser, url);
 #endif
 }
 
 std::string GenerateContentSettingsExceptionsSubPage(ContentSettingsType type) {
-  return kContentSettingsExceptionsSubPage + std::string(kHashMark) +
-         site_settings::ContentSettingsTypeToGroupName(type);
+  if (!base::FeatureList::IsEnabled(features::kMaterialDesignSettings)) {
+    return kDeprecatedOptionsContentSettingsExceptionsSubPage +
+           std::string(kHashMark) +
+           site_settings::ContentSettingsTypeToGroupName(type);
+  }
+
+  // In MD Settings, the exceptions no longer have a separate subpage.
+  // This list overrides the group names defined in site_settings_helper for the
+  // purposes of URL generation for MD Settings only. We need this because some
+  // of the old group names are no longer appropriate: i.e. "plugins" =>
+  // "flash".
+  //
+  // TODO(tommycli): Update the group names defined in site_settings_helper once
+  // Options is removed from Chrome. Then this list will no longer be needed.
+  typedef std::map<ContentSettingsType, std::string> ContentSettingPathMap;
+  CR_DEFINE_STATIC_LOCAL(
+      ContentSettingPathMap, kSettingsPathOverrides,
+      ({{CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, "automaticDownloads"},
+        {CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC, "backgroundSync"},
+        {CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, "microphone"},
+        {CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, "camera"},
+        {CONTENT_SETTINGS_TYPE_PLUGINS, "flash"},
+        {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, "unsandboxedPlugins"}}));
+  const auto it = kSettingsPathOverrides.find(type);
+  const std::string content_type_path =
+      (it == kSettingsPathOverrides.end())
+          ? site_settings::ContentSettingsTypeToGroupName(type)
+          : it->second;
+
+  return std::string(kContentSettingsSubPage) + "/" + content_type_path;
 }
 
 #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
@@ skipping 271 matching lines @@
       SigninManagerFactory::GetForProfile(original_profile);
   DCHECK(manager->IsSigninAllowed());
   if (manager->IsAuthenticated())
     ShowSettings(browser);
   else
     ShowBrowserSignin(browser, access_point);
 }
 #endif
 
 }  // namespace chrome