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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 1312453005: Removed Profile::GetHostContentSettingsMap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed patch conflict Created 5 years, 3 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
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 63925193a9b2c8d249ce37bd116bda2aacf7bc76..36e656abaa0fdc26e6e21b36579f5850631dd1e6 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -34,6 +34,7 @@
#include "chrome/browser/chrome_net_benchmarking_message_filter.h"
#include "chrome/browser/chrome_quota_permission_context.h"
#include "chrome/browser/content_settings/cookie_settings_factory.h"
+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
#include "chrome/browser/content_settings/tab_specific_content_settings.h"
#include "chrome/browser/defaults.h"
#include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
@@ -893,7 +894,7 @@ void ChromeContentBrowserClient::RenderProcessWillLaunch(
#endif
} else {
GetRendererContentSettingRules(
- profile->GetHostContentSettingsMap(), &rules);
+ HostContentSettingsMapFactory::GetForProfile(profile), &rules);
}
host->Send(new ChromeViewMsg_SetContentSettingRules(rules));
}
@@ -1961,7 +1962,7 @@ void ChromeContentBrowserClient::SelectClientCertificate(
Profile* profile =
Profile::FromBrowserContext(web_contents->GetBrowserContext());
scoped_ptr<base::Value> filter =
- profile->GetHostContentSettingsMap()->GetWebsiteSetting(
+ HostContentSettingsMapFactory::GetForProfile(profile)->GetWebsiteSetting(
requesting_url,
requesting_url,
CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE,

Powered by Google App Engine
This is Rietveld 408576698