components/content_settings/core/browser/content_settings_pref_provider.h - Issue 1468013002: ScopedPtrMap -> std::map from /component

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: components/content_settings/core/browser/content_settings_pref_provider.h

Issue 1468013002: ScopedPtrMap -> std::map from /component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: nit Created 5 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/content_settings/content_settings_pref_provider_unittest.cc ('k') | components/content_settings/core/browser/content_settings_pref_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings/core/browser/content_settings_pref_provider.h

diff --git a/components/content_settings/core/browser/content_settings_pref_provider.h b/components/content_settings/core/browser/content_settings_pref_provider.h

index d7632ba53f77a7e25cd6d46751e2f5a1d9e5b200..8554bcf51b7b72643e7d74563159792e851463db 100644

--- a/components/content_settings/core/browser/content_settings_pref_provider.h

+++ b/components/content_settings/core/browser/content_settings_pref_provider.h

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

// A content settings provider that takes its settings out of the pref service.

+#include <map>

#include <vector>

#include "base/basictypes.h"

-#include "base/containers/scoped_ptr_map.h"

#include "base/memory/scoped_ptr.h"

#include "base/prefs/pref_change_registrar.h"

#include "components/content_settings/core/browser/content_settings_observable_provider.h"

@@ -90,7 +90,7 @@ class PrefProvider : public ObservableProvider {

PrefChangeRegistrar pref_change_registrar_;

- base::ScopedPtrMap<ContentSettingsType, scoped_ptr<ContentSettingsPref>>

+ std::map<ContentSettingsType, scoped_ptr<ContentSettingsPref>>

content_settings_prefs_;

base::ThreadChecker thread_checker_;