chrome/browser/options_util.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/options_util.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/options_util.cc

diff --git a/chrome/browser/options_util.cc b/chrome/browser/options_util.cc

index 5d46ab50af1f701a19d5e7b048ac316a0768e3c2..94494a750101e86a2502c05772cc56d7586799b0 100644

--- a/chrome/browser/options_util.cc

+++ b/chrome/browser/options_util.cc

@@ -8,8 +8,8 @@

#include "chrome/browser/browser_process.h"

#include "chrome/browser/download/download_manager.h"

#include "chrome/browser/download/download_prefs.h"

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

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

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

#include "chrome/browser/host_zoom_map.h"

#include "chrome/browser/metrics/metrics_service.h"

#include "chrome/browser/notifications/desktop_notification_service.h"