Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3936)

Unified Diff: chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc

Issue 2454093003: MD Settings: Update Content Settings Types URLs. (Closed)
Patch Set: address pkasting comments Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/settings/privacy_page/privacy_page.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
index 2dddf0202d814565ca65957012ea9fc3c383c288..b997043d8734436251981d81efdbe525fe1dcd05 100644
--- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
+++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include "base/feature_list.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -22,6 +23,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/browser/sync/profile_sync_service_factory.h"
+#include "chrome/common/chrome_features.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
#include "components/browser_sync/profile_sync_service.h"
@@ -44,7 +46,6 @@ const char* const kChromeSettingsSubPages[] = {
chrome::kAutofillSubPage,
chrome::kClearBrowserDataSubPage,
chrome::kContentSettingsSubPage,
- chrome::kContentSettingsExceptionsSubPage,
chrome::kImportDataSubPage,
chrome::kLanguageOptionsSubPage,
chrome::kPasswordManagerSubPage,
@@ -182,6 +183,13 @@ std::vector<base::string16> ChromeAutocompleteProviderClient::GetBuiltinURLs() {
builtins.push_back(settings +
base::ASCIIToUTF16(kChromeSettingsSubPages[i]));
}
+
+ if (!base::FeatureList::IsEnabled(features::kMaterialDesignSettings)) {
+ builtins.push_back(
+ settings +
+ base::ASCIIToUTF16(
+ chrome::kDeprecatedOptionsContentSettingsExceptionsSubPage));
+ }
#endif
return builtins;
« no previous file with comments | « no previous file | chrome/browser/resources/settings/privacy_page/privacy_page.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698