chrome/browser/ui/content_settings/content_setting_bubble_model.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

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/content_settings/content_setting_bubble_model.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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/cocoa/window_size_autosaver_unittest.mm ('k') | chrome/browser/ui/gesture_prefs_observer_factory_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/content_settings/content_setting_bubble_model.cc

diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc

index 9823875b99d7dc65a8b315225bbeb5c333642905..2cb2f0a819546a6c7f766629768c3cd89b20de63 100644

--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc

+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc

@@ -4,6 +4,7 @@

#include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"

+#include "base/prefs/pref_service.h"

#include "base/utf_string_conversions.h"

#include "chrome/browser/api/infobars/infobar_service.h"

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

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

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

#include "chrome/browser/favicon/favicon_tab_helper.h"

#include "chrome/browser/plugins/chrome_plugin_service_filter.h"

-#include "chrome/browser/prefs/pref_service.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"

#include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate.h"