Index: chrome/browser/ui/exclusive_access/exclusive_access_manager.h |
diff --git a/chrome/browser/ui/exclusive_access/exclusive_access_manager.h b/chrome/browser/ui/exclusive_access/exclusive_access_manager.h |
index 0c10fe57cc66231cde8411a202fa508936a8f116..cbb8b9ded572cbd2a7baad2f0e57dac3e967facf 100644 |
--- a/chrome/browser/ui/exclusive_access/exclusive_access_manager.h |
+++ b/chrome/browser/ui/exclusive_access/exclusive_access_manager.h |
@@ -10,7 +10,7 @@ |
#include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" |
#include "chrome/browser/ui/exclusive_access/mouse_lock_controller.h" |
-class Browser; |
+class ExclusiveAccessContext; |
class FullscreenController; |
class GURL; |
class MouseLockController; |
@@ -24,7 +24,8 @@ class WebContents; |
// the exit bubble to reflect the combined state. |
class ExclusiveAccessManager { |
public: |
- explicit ExclusiveAccessManager(Browser* browser); |
+ explicit ExclusiveAccessManager( |
+ ExclusiveAccessContext* exclusive_access_context); |
~ExclusiveAccessManager(); |
FullscreenController* fullscreen_controller() { |
@@ -35,6 +36,10 @@ class ExclusiveAccessManager { |
return &mouse_lock_controller_; |
} |
+ ExclusiveAccessContext* exclusive_access_context() { |
miu
2015/02/26 20:07:57
Method should be const.
miu
2015/02/26 20:07:57
This seems to be causing a ton of 3+ line statemen
Sriram
2015/02/26 23:58:03
Done.
Sriram
2015/02/26 23:58:03
Done.
|
+ return exclusive_access_context_; |
+ } |
+ |
ExclusiveAccessBubbleType GetExclusiveAccessExitBubbleType() const; |
void UpdateExclusiveAccessExitBubbleContent(); |
@@ -57,9 +62,10 @@ class ExclusiveAccessManager { |
// Called by platform ExclusiveAccessExitBubble. |
void OnAcceptExclusiveAccessPermission(); |
void OnDenyExclusiveAccessPermission(); |
+ void ExitExclusiveAccess(); |
private: |
- Browser* const browser_; |
+ ExclusiveAccessContext* exclusive_access_context_; |
miu
2015/02/26 20:07:57
ExclusiveAccessContext* const ...;
Sriram
2015/02/26 23:58:03
Done.
|
FullscreenController fullscreen_controller_; |
MouseLockController mouse_lock_controller_; |