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

Unified Diff: chrome/browser/ui/exclusive_access/mouse_lock_controller.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/ui/exclusive_access/mouse_lock_controller.cc
diff --git a/chrome/browser/ui/exclusive_access/mouse_lock_controller.cc b/chrome/browser/ui/exclusive_access/mouse_lock_controller.cc
index f6adfac00fb2e7cbcf7041974ed2571c985034e8..84c36606344226751d0bfd035f57655a6a27039e 100644
--- a/chrome/browser/ui/exclusive_access/mouse_lock_controller.cc
+++ b/chrome/browser/ui/exclusive_access/mouse_lock_controller.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/ui/exclusive_access/mouse_lock_controller.h"
#include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"
@@ -137,10 +138,9 @@ bool MouseLockController::OnAcceptExclusiveAccessPermission() {
if (mouse_lock && !IsMouseLocked()) {
DCHECK(IsMouseLockRequested());
- HostContentSettingsMap* settings_map = exclusive_access_manager()
- ->context()
- ->GetProfile()
- ->GetHostContentSettingsMap();
+ HostContentSettingsMap* settings_map =
+ HostContentSettingsMapFactory::GetForProfile(
+ exclusive_access_manager()->context()->GetProfile());
GURL url = GetExclusiveAccessBubbleURL();
ContentSettingsPattern pattern = ContentSettingsPattern::FromURL(url);
@@ -245,10 +245,9 @@ ContentSetting MouseLockController::GetMouseLockSetting(const GURL& url) const {
->IsPrivilegedFullscreenForTab())
return CONTENT_SETTING_ALLOW;
- HostContentSettingsMap* settings_map = exclusive_access_manager()
- ->context()
- ->GetProfile()
- ->GetHostContentSettingsMap();
+ HostContentSettingsMap* settings_map =
+ HostContentSettingsMapFactory::GetForProfile(
+ exclusive_access_manager()->context()->GetProfile());
ContentSetting setting = settings_map->GetContentSetting(
url, url, CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string());

Powered by Google App Engine
This is Rietveld 408576698