chrome/browser/tab_contents/tab_contents.cc - Issue 5574001: Move ContentSettingsDetails and Pattern out of HostContentSettingsMap as separate classes.

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/tab_contents/tab_contents.cc

Issue 5574001: Move ContentSettingsDetails and Pattern out of HostContentSettingsMap as separate classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome/browser/content_settings

Patch Set: updates Created 10 years 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

« chrome/browser/content_settings/content_settings_details.h ('K') | « chrome/browser/plugin_exceptions_table_model_unittest.cc ('k') | chrome/browser/ui/cocoa/content_exceptions_window_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/tab_contents/tab_contents.cc

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

index 6d0a2a1a44c53fdcb434548eeef7975f3bb32990..640db4b7f2fbeb9714f32a5c9fc7ccf35ad204af 100644

--- a/chrome/browser/tab_contents/tab_contents.cc

+++ b/chrome/browser/tab_contents/tab_contents.cc

@@ -29,6 +29,7 @@

#include "chrome/browser/browser_shutdown.h"

#include "chrome/browser/cert_store.h"

#include "chrome/browser/character_encoding.h"

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

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

#include "chrome/browser/debugger/devtools_manager.h"

#include "chrome/browser/defaults.h"

@@ -3137,8 +3138,7 @@ void TabContents::Observe(NotificationType type,

break;

case NotificationType::CONTENT_SETTINGS_CHANGED: {

- Details<const HostContentSettingsMap::ContentSettingsDetails>

- settings_details(details);

+ Details<const ContentSettingsDetails> settings_details(details);

NavigationEntry* entry = controller_.GetActiveEntry();

GURL entry_url;

if (entry)