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

Side by Side Diff: chrome/browser/ui/exclusive_access/exclusive_access_manager.h

Issue 1814983003: Add an experimental keyboard lock, where Esc must be held to exit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing reviewer comments Created 4 years, 9 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_MANAGER_H_ 5 #ifndef CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_MANAGER_H_
6 #define CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_MANAGER_H_ 6 #define CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_MANAGER_H_
7 7
8 #include "base/feature_list.h" 8 #include "base/feature_list.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/timer/timer.h"
11 #include "chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h" 12 #include "chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h"
12 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" 13 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
13 #include "chrome/browser/ui/exclusive_access/mouse_lock_controller.h" 14 #include "chrome/browser/ui/exclusive_access/mouse_lock_controller.h"
14 15
15 class ExclusiveAccessContext; 16 class ExclusiveAccessContext;
16 class FullscreenController; 17 class FullscreenController;
17 class GURL; 18 class GURL;
18 class MouseLockController; 19 class MouseLockController;
19 20
20 namespace content { 21 namespace content {
(...skipping 18 matching lines...) Expand all
39 return &mouse_lock_controller_; 40 return &mouse_lock_controller_;
40 } 41 }
41 42
42 ExclusiveAccessContext* context() const { return exclusive_access_context_; } 43 ExclusiveAccessContext* context() const { return exclusive_access_context_; }
43 44
44 ExclusiveAccessBubbleType GetExclusiveAccessExitBubbleType() const; 45 ExclusiveAccessBubbleType GetExclusiveAccessExitBubbleType() const;
45 void UpdateExclusiveAccessExitBubbleContent(); 46 void UpdateExclusiveAccessExitBubbleContent();
46 47
47 GURL GetExclusiveAccessBubbleURL() const; 48 GURL GetExclusiveAccessBubbleURL() const;
48 49
50 static bool IsExperimentalKeyboardLockUIEnabled();
49 static bool IsSimplifiedFullscreenUIEnabled(); 51 static bool IsSimplifiedFullscreenUIEnabled();
50 52
51 // Callbacks //////////////////////////////////////////////////////////////// 53 // Callbacks ////////////////////////////////////////////////////////////////
52 54
53 // Called by Browser::TabDeactivated. 55 // Called by Browser::TabDeactivated.
54 void OnTabDeactivated(content::WebContents* web_contents); 56 void OnTabDeactivated(content::WebContents* web_contents);
55 57
56 // Called by Browser::ActiveTabChanged. 58 // Called by Browser::ActiveTabChanged.
57 void OnTabDetachedFromView(content::WebContents* web_contents); 59 void OnTabDetachedFromView(content::WebContents* web_contents);
58 60
59 // Called by Browser::TabClosingAt. 61 // Called by Browser::TabClosingAt.
60 void OnTabClosing(content::WebContents* web_contents); 62 void OnTabClosing(content::WebContents* web_contents);
61 63
62 // Called by Browser::PreHandleKeyboardEvent. 64 // Called by Browser::PreHandleKeyboardEvent.
63 bool HandleUserKeyPress(const content::NativeWebKeyboardEvent& event); 65 bool HandleUserKeyPress(const content::NativeWebKeyboardEvent& event);
64 66
65 // Called by Browser::ContentsMouseEvent. 67 // Called by Browser::ContentsMouseEvent.
66 void OnUserInput(); 68 void OnUserInput();
67 69
68 // Called by platform ExclusiveAccessExitBubble. 70 // Called by platform ExclusiveAccessExitBubble.
69 void OnAcceptExclusiveAccessPermission(); 71 void OnAcceptExclusiveAccessPermission();
70 void OnDenyExclusiveAccessPermission(); 72 void OnDenyExclusiveAccessPermission();
71 void ExitExclusiveAccess(); 73 void ExitExclusiveAccess();
72 void RecordBubbleReshownUMA(ExclusiveAccessBubbleType type); 74 void RecordBubbleReshownUMA(ExclusiveAccessBubbleType type);
73 75
74 private: 76 private:
77 // Called when the user has held down Escape.
78 void HandleUserHeldEscape();
79
75 ExclusiveAccessContext* const exclusive_access_context_; 80 ExclusiveAccessContext* const exclusive_access_context_;
76 FullscreenController fullscreen_controller_; 81 FullscreenController fullscreen_controller_;
77 MouseLockController mouse_lock_controller_; 82 MouseLockController mouse_lock_controller_;
83 base::Timer hold_timer_;
msw 2016/03/23 07:20:55 nit: use OneShotTimer
dominickn 2016/03/23 10:07:03 Done.
78 84
79 DISALLOW_COPY_AND_ASSIGN(ExclusiveAccessManager); 85 DISALLOW_COPY_AND_ASSIGN(ExclusiveAccessManager);
80 }; 86 };
81 87
82 #endif // CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_MANAGER_H_ 88 #endif // CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698