chrome/browser/ui/webui/options/content_settings_handler.cc - Issue 518803009: Move content_settings_pattern and content_settings_pattern_parser to the content_settings component.

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 518803009: Move content_settings_pattern and content_settings_pattern_parser to the content_settings component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 6 years, 3 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 | « chrome/browser/ui/website_settings/website_settings.cc ('k') | chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 3f1f71aaec85f11276fd803b5da1d30a100e19d2..233afba0d497179fa787ab32d01248fd74673f10 100644

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

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

@@ -29,12 +29,12 @@

#include "chrome/browser/ui/browser_list.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/content_settings.h"

-#include "chrome/common/content_settings_pattern.h"

#include "chrome/common/extensions/manifest_handlers/app_launch_info.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

#include "chrome/grit/generated_resources.h"

#include "chrome/grit/locale_settings.h"

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

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

#include "components/user_prefs/user_prefs.h"

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