chrome/browser/ui/webui/options/content_settings_handler.cc - Issue 7885006: Moving ContentSettingsPattern from chrome/browser/content_settings to chrome/common.

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 7885006: Moving ContentSettingsPattern from chrome/browser/content_settings to chrome/common. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Keeping up to date with trunk. Created 9 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

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 62a78065459d1663b75bcf19dcc9c0f28fa7be28..5ff467bb56a55ffd8044c85d23621fff0cc57348 100644

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

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

@@ -14,7 +14,6 @@

#include "base/values.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/content_settings/content_settings_details.h"

-#include "chrome/browser/content_settings/content_settings_pattern.h"

#include "chrome/browser/content_settings/content_settings_utils.h"

#include "chrome/browser/content_settings/host_content_settings_map.h"

#include "chrome/browser/custom_handlers/protocol_handler_registry.h"

@@ -24,6 +23,7 @@

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

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/chrome_switches.h"

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

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

#include "content/browser/tab_contents/tab_contents.h"

« no previous file with comments | « chrome/browser/notifications/notification_exceptions_table_model.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »