chrome/browser/prefs/browser_prefs.cc - Issue 5367006: Refactor: move HostContentSettingsMap to content_settings

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/prefs/browser_prefs.cc

Issue 5367006: Refactor: move HostContentSettingsMap to content_settings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase again Created 10 years, 1 month 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/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

index dcc36248716a48cc13baaec75ba6eebeb2a2b9ca..b2c1f7375a8690427d2b8e30173ea71bfcf6a574 100644

--- a/chrome/browser/prefs/browser_prefs.cc

+++ b/chrome/browser/prefs/browser_prefs.cc

@@ -11,6 +11,7 @@

#include "chrome/browser/background_page_tracker.h"

#include "chrome/browser/bookmarks/bookmark_utils.h"

#include "chrome/browser/browser_shutdown.h"

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

#include "chrome/browser/debugger/devtools_manager.h"

#include "chrome/browser/dom_ui/flags_ui.h"

#include "chrome/browser/dom_ui/new_tab_ui.h"

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

#include "chrome/browser/geolocation/geolocation_content_settings_map.h"

#include "chrome/browser/geolocation/geolocation_prefs.h"

#include "chrome/browser/google/google_url_tracker.h"

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

#include "chrome/browser/host_zoom_map.h"

#include "chrome/browser/intranet_redirect_detector.h"

#include "chrome/browser/instant/instant_controller.h"

« no previous file with comments | « chrome/browser/plugin_exceptions_table_model.h ('k') | chrome/browser/profile_impl.cc » ('j') | no next file with comments »