Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(143)

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 78303005: ContentSettings API should not interact with <webview> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed Jochen's comments Created 7 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
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 37faaf8c449c745fe866c41bd4991e55fdbe38cf..388c81819a6e3e569cbe79009691eae73bd69ffe 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -943,7 +943,13 @@ void ChromeContentBrowserClient::RenderProcessHostCreated(
SendExtensionWebRequestStatusToHost(host);
RendererContentSettingRules rules;
- GetRendererContentSettingRules(profile->GetHostContentSettingsMap(), &rules);
+ if (host->IsGuest()) {
+ GuestView::GetDefaultContentSettingRules(&rules, false /* incognito */);
jochen (gone - plz use gerrit) 2013/12/03 15:35:07 this should be just profile->IsOffTheRecord();
Fady Samuel 2013/12/03 15:56:26 Done.
+ GuestView::GetDefaultContentSettingRules(&rules, true /* incognito */);
+ } else {
+ GetRendererContentSettingRules(
+ profile->GetHostContentSettingsMap(), &rules);
+ }
host->Send(new ChromeViewMsg_SetContentSettingRules(rules));
}
@@ -1276,6 +1282,7 @@ void ChromeContentBrowserClient::SiteInstanceGotProcess(
const Extension* extension = service->extensions()->GetExtensionOrAppByURL(
site_instance->GetSiteURL());
+
if (!extension)
return;

Powered by Google App Engine
This is Rietveld 408576698