chrome/browser/extensions/api/content_settings/content_settings_api.cc - Issue 10952021: Moving preference API into api/preferences

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/extensions/api/content_settings/content_settings_api.cc

Issue 10952021: Moving preference API into api/preferences (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 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/extensions/api/content_settings/content_settings_api.cc

diff --git a/chrome/browser/extensions/api/content_settings/content_settings_api.cc b/chrome/browser/extensions/api/content_settings/content_settings_api.cc

index c176a68e9b206b304a6d65422f0b0a0bee41848d..88647b0239d93ce7568a24fd73345f7cfb47b672 100644

--- a/chrome/browser/extensions/api/content_settings/content_settings_api.cc

+++ b/chrome/browser/extensions/api/content_settings/content_settings_api.cc

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

#include "base/bind.h"

#include "base/command_line.h"

#include "base/values.h"

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

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

#include "chrome/browser/extensions/api/content_settings/content_settings_api_constants.h"

#include "chrome/browser/extensions/api/content_settings/content_settings_helpers.h"

#include "chrome/browser/extensions/api/content_settings/content_settings_store.h"

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

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

-#include "chrome/browser/extensions/extension_preference_api_constants.h"

-#include "chrome/browser/extensions/extension_preference_helpers.h"

+#include "chrome/browser/extensions/api/preference/preference_api_constants.h"

+#include "chrome/browser/extensions/api/preference/preference_helpers.h"

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/plugin_finder.h"

#include "chrome/browser/plugin_installer.h"

@@ -34,8 +34,8 @@ using content::PluginService;

namespace Clear = extensions::api::content_settings::ContentSetting::Clear;

namespace Get = extensions::api::content_settings::ContentSetting::Get;

namespace Set = extensions::api::content_settings::ContentSetting::Set;

-namespace pref_helpers = extension_preference_helpers;

-namespace pref_keys = extension_preference_api_constants;

+namespace pref_helpers = extensions::preference_helpers;

+namespace pref_keys = extensions::preference_api_constants;

namespace {

« no previous file with comments | « no previous file | chrome/browser/extensions/api/font_settings/font_settings_api.cc » ('j') | no next file with comments »