chrome/browser/ui/webui/options/content_settings_handler.h - Issue 579673003: Move content_settings_observer.h, content_settings_provider.h, content_settings_rule.* to the compo…

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.h

Issue 579673003: Move content_settings_observer.h, content_settings_provider.h, content_settings_rule.* to the compo… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix chrome/browser/BUILD.gn 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

« chrome/browser/ui/website_settings/website_settings_unittest.cc ('K') | « chrome/browser/ui/website_settings/website_settings_unittest.cc ('k') | chrome/browser/ui/webui/options/content_settings_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index aa44176beff915c2c86a43fe8d81dca3197d90ed..a02fd2ea27ac25c85a1df3ce8e1677769a075259 100644

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

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

@@ -10,10 +10,10 @@

#include "base/memory/scoped_ptr.h"

#include "base/prefs/pref_change_registrar.h"

#include "base/scoped_observer.h"

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

#include "chrome/browser/pepper_flash_settings_manager.h"

#include "chrome/browser/ui/webui/options/options_ui.h"

#include "chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.h"

+#include "components/content_settings/core/browser/content_settings_observer.h"

vabr (Chromium) 2014/09/18 08:54:57 Drop this, as in https://codereview.chromium.org/4

vasilii 2014/09/18 09:45:41 Used in line 29.

vabr (Chromium) 2014/09/18 09:57:10 Sorry, I put the comment in a wrong file. Correcte

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

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

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