components/content_settings/core/browser/content_settings_origin_identifier_value_map.h - Issue 1034143002: Content settings clean-up: Clarify resource identifier & get rid of NO_RESOURCE_IDENTIFIER.

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_origin_identifier_value_map.h

Issue 1034143002: Content settings clean-up: Clarify resource identifier & get rid of NO_RESOURCE_IDENTIFIER. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressing nit. Created 5 years, 8 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/notifications/platform_notification_service_impl.cc ('k') | components/content_settings/core/browser/content_settings_policy_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_origin_identifier_value_map.h

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

index 3489395580fce388fa072afc3434d3a57c9e43be..09cac65b9bf3fc2587959e3d9c7f62aeef30bd40 100644

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

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

@@ -9,8 +9,7 @@

#include <string>

#include "base/memory/linked_ptr.h"

-#include "components/content_settings/core/common/content_settings_pattern.h"

-#include "components/content_settings/core/common/content_settings_types.h"

+#include "components/content_settings/core/common/content_settings.h"

class GURL;

@@ -25,7 +24,6 @@ class RuleIterator;

class OriginIdentifierValueMap {

public:

- typedef std::string ResourceIdentifier;

struct EntryMapKey {

ContentSettingsType content_type;

ResourceIdentifier resource_identifier;