| 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 a053b859ee9353bbfd878534b8cf2f65b8fa358c..4e6f3f33d03048d9341a54833e96dfb23fb4d3ec 100644
|
| --- a/chrome/browser/ui/exclusive_access/mouse_lock_controller.cc
|
| +++ b/chrome/browser/ui/exclusive_access/mouse_lock_controller.cc
|
| @@ -7,6 +7,8 @@
|
| #include "chrome/browser/chrome_notification_types.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/ui/browser.h"
|
| +#include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"
|
| +#include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
|
| #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
|
| #include "components/content_settings/core/browser/host_content_settings_map.h"
|
| #include "content/public/browser/notification_service.h"
|
| @@ -17,9 +19,8 @@
|
| using content::RenderViewHost;
|
| using content::WebContents;
|
|
|
| -MouseLockController::MouseLockController(ExclusiveAccessManager* manager,
|
| - Browser* browser)
|
| - : ExclusiveAccessControllerBase(manager, browser),
|
| +MouseLockController::MouseLockController(ExclusiveAccessManager* manager)
|
| + : ExclusiveAccessControllerBase(manager),
|
| mouse_lock_state_(MOUSELOCK_NOT_REQUESTED) {
|
| }
|
|
|
| @@ -136,8 +137,10 @@ bool MouseLockController::OnAcceptExclusiveAccessPermission() {
|
| if (mouse_lock && !IsMouseLocked()) {
|
| DCHECK(IsMouseLockRequested());
|
|
|
| - HostContentSettingsMap* settings_map =
|
| - profile()->GetHostContentSettingsMap();
|
| + HostContentSettingsMap* settings_map = exclusive_access_manager()
|
| + ->exclusive_access_context()
|
| + ->GetProfile()
|
| + ->GetHostContentSettingsMap();
|
|
|
| GURL url = GetExclusiveAccessBubbleURL();
|
| ContentSettingsPattern pattern = ContentSettingsPattern::FromURL(url);
|
| @@ -228,7 +231,10 @@ ContentSetting MouseLockController::GetMouseLockSetting(const GURL& url) const {
|
| url.SchemeIsFile())
|
| return CONTENT_SETTING_ALLOW;
|
|
|
| - HostContentSettingsMap* settings_map = profile()->GetHostContentSettingsMap();
|
| + HostContentSettingsMap* settings_map = exclusive_access_manager()
|
| + ->exclusive_access_context()
|
| + ->GetProfile()
|
| + ->GetHostContentSettingsMap();
|
| return settings_map->GetContentSetting(
|
| url, url, CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string());
|
| }
|
|
|