chrome/browser/ui/webui/options/content_settings_handler.cc - Issue 1658793002: Update chrome for new prefs location.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/options/content_settings_handler.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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:

Index: chrome/browser/ui/webui/options/content_settings_handler.cc

diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc

index cff82e59759d3860ffebcf6f15bd27c69291471f..4d1e47e042ad1c946ecce32f802bf448f8c4b2c6 100644

--- a/chrome/browser/ui/webui/options/content_settings_handler.cc

+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc

@@ -15,7 +15,6 @@

#include "base/command_line.h"

#include "base/logging.h"

#include "base/macros.h"

-#include "base/prefs/pref_service.h"

#include "base/stl_util.h"

#include "base/strings/string_number_conversions.h"

#include "base/strings/utf_string_conversions.h"

@@ -51,6 +50,7 @@

#include "components/content_settings/core/common/content_settings.h"

#include "components/content_settings/core/common/content_settings_pattern.h"

#include "components/google/core/browser/google_util.h"

+#include "components/prefs/pref_service.h"

#include "components/signin/core/common/profile_management_switches.h"

#include "components/user_prefs/user_prefs.h"

#include "content/public/browser/notification_service.h"