| OLD | NEW |
| 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/macros.h" | 9 #include "base/macros.h" |
| 9 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 10 #include "chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h" | 11 #include "chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h" |
| 11 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" | 12 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" |
| 12 #include "chrome/browser/ui/exclusive_access/mouse_lock_controller.h" | 13 #include "chrome/browser/ui/exclusive_access/mouse_lock_controller.h" |
| 13 | 14 |
| 14 class ExclusiveAccessContext; | 15 class ExclusiveAccessContext; |
| 15 class FullscreenController; | 16 class FullscreenController; |
| 16 class GURL; | 17 class GURL; |
| 17 class MouseLockController; | 18 class MouseLockController; |
| 18 | 19 |
| 19 namespace content { | 20 namespace content { |
| 20 struct NativeWebKeyboardEvent; | 21 struct NativeWebKeyboardEvent; |
| 21 class WebContents; | 22 class WebContents; |
| 22 } | 23 } |
| 23 | 24 |
| 24 // This class combines the different exclusive access modes (like fullscreen and | 25 // This class combines the different exclusive access modes (like fullscreen and |
| 25 // mouse lock) which are each handled by respective controller. It also updates | 26 // mouse lock) which are each handled by respective controller. It also updates |
| 26 // the exit bubble to reflect the combined state. | 27 // the exit bubble to reflect the combined state. |
| 27 class ExclusiveAccessManager { | 28 class ExclusiveAccessManager { |
| 28 public: | 29 public: |
| 30 // A new user experience for transitioning into fullscreen and mouse pointer |
| 31 // lock states. |
| 32 static const base::Feature kSimplifiedUIFeature; |
| 33 |
| 29 explicit ExclusiveAccessManager( | 34 explicit ExclusiveAccessManager( |
| 30 ExclusiveAccessContext* exclusive_access_context); | 35 ExclusiveAccessContext* exclusive_access_context); |
| 31 ~ExclusiveAccessManager(); | 36 ~ExclusiveAccessManager(); |
| 32 | 37 |
| 33 FullscreenController* fullscreen_controller() { | 38 FullscreenController* fullscreen_controller() { |
| 34 return &fullscreen_controller_; | 39 return &fullscreen_controller_; |
| 35 } | 40 } |
| 36 | 41 |
| 37 MouseLockController* mouse_lock_controller() { | 42 MouseLockController* mouse_lock_controller() { |
| 38 return &mouse_lock_controller_; | 43 return &mouse_lock_controller_; |
| (...skipping 29 matching lines...) Expand all Loading... |
| 68 | 73 |
| 69 private: | 74 private: |
| 70 ExclusiveAccessContext* const exclusive_access_context_; | 75 ExclusiveAccessContext* const exclusive_access_context_; |
| 71 FullscreenController fullscreen_controller_; | 76 FullscreenController fullscreen_controller_; |
| 72 MouseLockController mouse_lock_controller_; | 77 MouseLockController mouse_lock_controller_; |
| 73 | 78 |
| 74 DISALLOW_COPY_AND_ASSIGN(ExclusiveAccessManager); | 79 DISALLOW_COPY_AND_ASSIGN(ExclusiveAccessManager); |
| 75 }; | 80 }; |
| 76 | 81 |
| 77 #endif // CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_MANAGER_H_ | 82 #endif // CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_MANAGER_H_ |
| OLD | NEW |