| Index: chrome/browser/ui/exclusive_access/mouse_lock_controller.h
|
| diff --git a/chrome/browser/ui/exclusive_access/mouse_lock_controller.h b/chrome/browser/ui/exclusive_access/mouse_lock_controller.h
|
| index 9a3bd463f075d8be7ce2d51a588c2cf3b3286c72..3e3b9f20884eb3285d4486f5b89d4726847dcaee 100644
|
| --- a/chrome/browser/ui/exclusive_access/mouse_lock_controller.h
|
| +++ b/chrome/browser/ui/exclusive_access/mouse_lock_controller.h
|
| @@ -16,8 +16,7 @@ class MouseLockController : public ExclusiveAccessControllerBase {
|
| ~MouseLockController() override;
|
|
|
| bool IsMouseLocked() const;
|
| - bool IsMouseLockSilentlyAccepted() const;
|
| - bool IsMouseLockRequested() const;
|
| + bool IsMouseLockedSilently() const;
|
|
|
| void RequestToLockMouse(content::WebContents* web_contents,
|
| bool user_gesture,
|
| @@ -27,8 +26,6 @@ class MouseLockController : public ExclusiveAccessControllerBase {
|
| bool HandleUserPressedEscape() override;
|
|
|
| void ExitExclusiveAccessToPreviousState() override;
|
| - bool OnAcceptExclusiveAccessPermission() override;
|
| - bool OnDenyExclusiveAccessPermission() override;
|
|
|
| // Called by Browser::LostMouseLock.
|
| void LostMouseLock();
|
| @@ -45,14 +42,11 @@ class MouseLockController : public ExclusiveAccessControllerBase {
|
|
|
| private:
|
| enum MouseLockState {
|
| - MOUSELOCK_NOT_REQUESTED,
|
| - // The page requests to lock the mouse and the user hasn't responded to the
|
| - // request.
|
| - MOUSELOCK_REQUESTED,
|
| - // Mouse lock has been allowed by the user.
|
| - MOUSELOCK_ACCEPTED,
|
| - // Mouse lock has been silently accepted, no notification to user.
|
| - MOUSELOCK_ACCEPTED_SILENTLY
|
| + MOUSELOCK_UNLOCKED,
|
| + // Mouse has been locked.
|
| + MOUSELOCK_LOCKED,
|
| + // Mouse has been locked silently, with no notification to user.
|
| + MOUSELOCK_LOCKED_SILENTLY
|
| };
|
|
|
| void NotifyMouseLockChange();
|
| @@ -61,8 +55,6 @@ class MouseLockController : public ExclusiveAccessControllerBase {
|
| void NotifyTabExclusiveAccessLost() override;
|
| void RecordBubbleReshowsHistogram(int bubble_reshow_count) override;
|
|
|
| - ContentSetting GetMouseLockSetting(const GURL& url) const;
|
| -
|
| MouseLockState mouse_lock_state_;
|
|
|
| bool fake_mouse_lock_for_test_;
|
|
|