Index: chrome/browser/ui/views/exclusive_access_bubble_views.cc |
diff --git a/chrome/browser/ui/views/exclusive_access_bubble_views.cc b/chrome/browser/ui/views/exclusive_access_bubble_views.cc |
index 466355d0ae325ae475b08fd75437040a6794b350..659a40306f5d2b7d2a5aa7a594b94faf130a342e 100644 |
--- a/chrome/browser/ui/views/exclusive_access_bubble_views.cc |
+++ b/chrome/browser/ui/views/exclusive_access_bubble_views.cc |
@@ -266,7 +266,11 @@ ExclusiveAccessBubbleViews::ExclusiveAccessBubbleViews( |
popup_(nullptr), |
animation_(new gfx::SlideAnimation(this)), |
animated_attribute_(ANIMATED_ATTRIBUTE_BOUNDS) { |
- animation_->Reset(1); |
+ // With the simplified fullscreen UI flag, initially hidden. In the normal |
msw
2015/08/05 17:29:55
nit: "Hide the bubble initially with the simplifie
Matt Giuca
2015/08/06 03:33:03
Done~ish.
|
+ // case, initially visible. |
+ double initial_value = |
+ ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled() ? 0 : 1; |
+ animation_->Reset(initial_value); |
// Create the contents view. |
ui::Accelerator accelerator(ui::VKEY_UNKNOWN, ui::EF_NONE); |
@@ -297,7 +301,8 @@ ExclusiveAccessBubbleViews::ExclusiveAccessBubbleViews( |
// that it is sliding off the top of the screen. |
popup_->GetRootView()->SetLayoutManager(nullptr); |
view_->SetBounds(0, 0, size.width(), size.height()); |
- popup_->ShowInactive(); // This does not activate the popup. |
+ if (!ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled()) |
+ popup_->ShowInactive(); // This does not activate the popup. |
popup_->AddObserver(this); |