From b9a4ea7fbdc54868b60d50bc5fade451718dec23 Mon Sep 17 00:00:00 2001 From: "jochen@chromium.org" Date: Fri, 25 Jun 2010 07:11:23 +0000 Subject: Allow content setting changes in incognito mode. This removes the logic to disable the "remeber" functions in the UI elements (basically reverting r44084, but leaves the incognito host content setting map in place. Changes to this map are allowed but do not get stored in preferences. BUG=44480 TEST=none Review URL: http://codereview.chromium.org/2811025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50829 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/tab_contents/tab_contents.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chrome/browser/tab_contents') diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index 725db75..25afd700 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -2974,11 +2974,11 @@ void TabContents::Observe(NotificationType type, GURL entry_url; if (entry) entry_url = entry->url(); - Source content_settings(source); if (settings_details.ptr()->update_all() || settings_details.ptr()->pattern().Matches(entry_url)) { render_view_host()->SendContentSettings(entry_url, - content_settings.ptr()->GetContentSettings(entry_url)); + profile()->GetHostContentSettingsMap()-> + GetContentSettings(entry_url)); } break; } -- cgit v1.1