diff options
author | sriramsr <sriramsr@chromium.org> | 2015-03-03 16:03:32 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-04 00:05:07 +0000 |
commit | 39b6b787e7c4cbcecf1c9be40e9f47b76cd3c14b (patch) | |
tree | a4364f260f85533d6bd0bbee8bf06229bb14d4b1 /chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.cc | |
parent | 59e9a996f54bb238beb5a51dd864eb0febb8728c (diff) | |
download | chromium_src-39b6b787e7c4cbcecf1c9be40e9f47b76cd3c14b.zip chromium_src-39b6b787e7c4cbcecf1c9be40e9f47b76cd3c14b.tar.gz chromium_src-39b6b787e7c4cbcecf1c9be40e9f47b76cd3c14b.tar.bz2 |
Refactor away the Browser* dependency in exclusive_access
This change is needed to support the use of the exclusive
access bubble from extensions. There are two scenarios
under which the bubble will be used to:
- Display the bubble when keyboard lock is in effect.
- Display the fullscreen/mouse lock UI from Hosted app (not
hooked up in this CL).
Exclusive access controllers such as fullscreen and mouse
lock are updated to no longer access Browser* object
directly, but instead use new ExclusiveAccessContext and
ExclusiveAccessBubbleViewsContext interfaces. These are
implemented by BrowserView and will in the future be
implemented by NativeAppWindow.
Review URL: https://codereview.chromium.org/877413004
Cr-Commit-Position: refs/heads/master@{#318965}
Diffstat (limited to 'chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.cc')
-rw-r--r-- | chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.cc index 0a6fbc5..a8af8b3 100644 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.cc +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.cc @@ -753,10 +753,13 @@ void FullscreenControllerStateTest::VerifyWindowStateExpectations( EXPECT_EQ(GetFullscreenController()->IsWindowFullscreenForTabOrPending(), !!fullscreen_for_tab) << GetAndClearDebugLog(); } + +#if defined(OS_WIN) if (in_metro_snap != IN_METRO_SNAP_NO_EXPECTATION) { EXPECT_EQ(GetFullscreenController()->IsInMetroSnapMode(), !!in_metro_snap) << GetAndClearDebugLog(); } +#endif // OS_WIN } FullscreenController* FullscreenControllerStateTest::GetFullscreenController() { |