| 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 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h" | 5 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 #include "chrome/browser/app_mode/app_mode_utils.h" | 9 #include "chrome/browser/app_mode/app_mode_utils.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| 11 #include "chrome/browser/ui/browser_window.h" | 11 #include "chrome/browser/ui/browser_window.h" |
| 12 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h" | 12 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h" |
| 13 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" | 13 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" |
| 14 #include "chrome/browser/ui/exclusive_access/mouse_lock_controller.h" | 14 #include "chrome/browser/ui/exclusive_access/mouse_lock_controller.h" |
| 15 #include "chrome/common/chrome_features.h" |
| 15 #include "chrome/common/chrome_switches.h" | 16 #include "chrome/common/chrome_switches.h" |
| 16 #include "content/public/browser/native_web_keyboard_event.h" | 17 #include "content/public/browser/native_web_keyboard_event.h" |
| 17 #include "ui/events/keycodes/keyboard_codes.h" | 18 #include "ui/events/keycodes/keyboard_codes.h" |
| 18 | 19 |
| 19 using content::WebContents; | 20 using content::WebContents; |
| 20 | 21 |
| 21 const base::Feature ExclusiveAccessManager::kSimplifiedUIFeature = { | |
| 22 "ViewsSimplifiedFullscreenUI", | |
| 23 #if defined(USE_AURA) | |
| 24 base::FEATURE_ENABLED_BY_DEFAULT, | |
| 25 #else | |
| 26 base::FEATURE_DISABLED_BY_DEFAULT, | |
| 27 #endif | |
| 28 }; | |
| 29 | |
| 30 ExclusiveAccessManager::ExclusiveAccessManager( | 22 ExclusiveAccessManager::ExclusiveAccessManager( |
| 31 ExclusiveAccessContext* exclusive_access_context) | 23 ExclusiveAccessContext* exclusive_access_context) |
| 32 : exclusive_access_context_(exclusive_access_context), | 24 : exclusive_access_context_(exclusive_access_context), |
| 33 fullscreen_controller_(this), | 25 fullscreen_controller_(this), |
| 34 mouse_lock_controller_(this) { | 26 mouse_lock_controller_(this) { |
| 35 } | 27 } |
| 36 | 28 |
| 37 ExclusiveAccessManager::~ExclusiveAccessManager() { | 29 ExclusiveAccessManager::~ExclusiveAccessManager() { |
| 38 } | 30 } |
| 39 | 31 |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 | 85 |
| 94 GURL ExclusiveAccessManager::GetExclusiveAccessBubbleURL() const { | 86 GURL ExclusiveAccessManager::GetExclusiveAccessBubbleURL() const { |
| 95 GURL result = fullscreen_controller_.GetURLForExclusiveAccessBubble(); | 87 GURL result = fullscreen_controller_.GetURLForExclusiveAccessBubble(); |
| 96 if (!result.is_valid()) | 88 if (!result.is_valid()) |
| 97 result = mouse_lock_controller_.GetURLForExclusiveAccessBubble(); | 89 result = mouse_lock_controller_.GetURLForExclusiveAccessBubble(); |
| 98 return result; | 90 return result; |
| 99 } | 91 } |
| 100 | 92 |
| 101 // static | 93 // static |
| 102 bool ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled() { | 94 bool ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled() { |
| 103 return base::FeatureList::IsEnabled(kSimplifiedUIFeature); | 95 return base::FeatureList::IsEnabled(features::kSimplifiedFullscreenUI); |
| 104 } | 96 } |
| 105 | 97 |
| 106 void ExclusiveAccessManager::OnTabDeactivated(WebContents* web_contents) { | 98 void ExclusiveAccessManager::OnTabDeactivated(WebContents* web_contents) { |
| 107 fullscreen_controller_.OnTabDeactivated(web_contents); | 99 fullscreen_controller_.OnTabDeactivated(web_contents); |
| 108 mouse_lock_controller_.OnTabDeactivated(web_contents); | 100 mouse_lock_controller_.OnTabDeactivated(web_contents); |
| 109 } | 101 } |
| 110 | 102 |
| 111 void ExclusiveAccessManager::OnTabDetachedFromView(WebContents* web_contents) { | 103 void ExclusiveAccessManager::OnTabDetachedFromView(WebContents* web_contents) { |
| 112 fullscreen_controller_.OnTabDetachedFromView(web_contents); | 104 fullscreen_controller_.OnTabDetachedFromView(web_contents); |
| 113 mouse_lock_controller_.OnTabDetachedFromView(web_contents); | 105 mouse_lock_controller_.OnTabDetachedFromView(web_contents); |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 fullscreen = true; | 174 fullscreen = true; |
| 183 mouselock = true; | 175 mouselock = true; |
| 184 break; | 176 break; |
| 185 } | 177 } |
| 186 | 178 |
| 187 if (fullscreen) | 179 if (fullscreen) |
| 188 fullscreen_controller_.RecordBubbleReshownUMA(); | 180 fullscreen_controller_.RecordBubbleReshownUMA(); |
| 189 if (mouselock) | 181 if (mouselock) |
| 190 mouse_lock_controller_.RecordBubbleReshownUMA(); | 182 mouse_lock_controller_.RecordBubbleReshownUMA(); |
| 191 } | 183 } |
| OLD | NEW |