Enable showing the toolkit-views simplified fullscreen UI on Mac.

chrome/browser/ui/views/exclusive_access_bubble_views.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h"
 
 #include <utility>
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 371 matching lines @@
 ExclusiveAccessBubbleViews::ExclusiveAccessBubbleViews(
     ExclusiveAccessBubbleViewsContext* context,
     const GURL& url,
     ExclusiveAccessBubbleType bubble_type)
     : ExclusiveAccessBubble(context->GetExclusiveAccessManager(),
                             url,
                             bubble_type),
       bubble_view_context_(context),
       popup_(nullptr),
       animation_(new gfx::SlideAnimation(this)),
-      animated_attribute_(ANIMATED_ATTRIBUTE_BOUNDS) {
+      animated_attribute_(ExpectedAnimationAttribute()) {

[tapted, 2016/02/03 06:20:53]

this used to happen in a call to UpdateForImmersiveState() at the end of the
constructor. See next comment why that's bad.

[msw, 2016/02/03 18:52:24]

Acknowledged.

   // With the simplified fullscreen UI flag, initially hide the bubble;
   // otherwise, initially show it.
   double initial_value =
       ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled() ? 0 : 1;
   animation_->Reset(initial_value);
 
   // Create the contents view.
   ui::Accelerator accelerator(ui::VKEY_UNKNOWN, ui::EF_NONE);
-  bool got_accelerator =
-      bubble_view_context_->GetBubbleAssociatedWidget()->GetAccelerator(
-          IDC_FULLSCREEN, &accelerator);
+  bool got_accelerator = bubble_view_context_->GetAcceleratorForCommandId(
+      IDC_FULLSCREEN, &accelerator);
   DCHECK(got_accelerator);
   view_ = new ExclusiveAccessView(this, accelerator.GetShortcutText(), url,
                                   bubble_type_);
 
   // TODO(yzshen): Change to use the new views bubble, BubbleDelegateView.
   // TODO(pkotwicz): When this becomes a views bubble, make sure that this
   // bubble is ignored by ImmersiveModeControllerAsh::BubbleManager.
   // Initialize the popup.
   popup_ = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-  params.parent =
-      bubble_view_context_->GetBubbleAssociatedWidget()->GetNativeView();
+  params.parent = bubble_view_context_->GetParentView();
   // The simplified UI just shows a notice; clicks should go through to the
   // underlying window.
   params.accept_events =
       !ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled();
   popup_->Init(params);
   popup_->SetContentsView(view_);
   gfx::Size size = GetPopupRect(true).size();
   // Bounds are in screen coordinates.
   popup_->SetBounds(GetPopupRect(false));

[tapted, 2016/02/03 06:20:53]

prior to the change to the animated_attribute_ initializer, this line would set
the size of the popup to have a zero height. (because GetPopupRect(..) thought
it was animating the bounds, not the opacity). We are overly cautious about
showing zero-sized windows on Mac for historical reasons (window server bugs) -
so this hit a DCHECK.

The bounds for opacity-animations would previously be fixed up by 
UpdateForImmersiveState() calling UpdateBounds() at the end of the constructor,
but now there's no need for that.

[msw, 2016/02/03 18:52:24]

Acknowledged.

   // We set layout manager to nullptr to prevent the widget from sizing its
   // contents to the same size as itself. This prevents the widget contents from
   // shrinking while we animate the height of the popup to give the impression
   // that it is sliding off the top of the screen.
   popup_->GetRootView()->SetLayoutManager(nullptr);
   view_->SetBounds(0, 0, size.width(), size.height());
   if (!ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled())
     popup_->ShowInactive();  // This does not activate the popup.
 
   popup_->AddObserver(this);
 
   registrar_.Add(this, chrome::NOTIFICATION_FULLSCREEN_CHANGED,
                  content::Source<FullscreenController>(
                      bubble_view_context_->GetExclusiveAccessManager()
                          ->fullscreen_controller()));
 
-  UpdateForImmersiveState();
+  UpdateMouseWatcher();
 }
 
 ExclusiveAccessBubbleViews::~ExclusiveAccessBubbleViews() {
   popup_->RemoveObserver(this);
 
   // This is tricky.  We may be in an ATL message handler stack, in which case
   // the popup cannot be deleted yet.  We also can't set the popup's ownership
   // model to NATIVE_WIDGET_OWNS_WIDGET because if the user closed the last tab
   // while in fullscreen mode, Windows has already destroyed the popup HWND by
   // the time we get here, and thus either the popup will already have been
@@ skipping 31 matching lines @@
 
 void ExclusiveAccessBubbleViews::RepositionIfVisible() {
   if (popup_->IsVisible())
     UpdateBounds();
 }
 
 views::View* ExclusiveAccessBubbleViews::GetView() {
   return view_;
 }
 
+ExclusiveAccessBubbleViews::AnimatedAttribute
+ExclusiveAccessBubbleViews::ExpectedAnimationAttribute() {
+  return ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled() ||
+                 bubble_view_context_->IsImmersiveModeEnabled()
+             ? ANIMATED_ATTRIBUTE_OPACITY
+             : ANIMATED_ATTRIBUTE_BOUNDS;
+}
+
 void ExclusiveAccessBubbleViews::UpdateMouseWatcher() {
   bool should_watch_mouse = false;
   if (popup_->IsVisible())
     should_watch_mouse =
         !exclusive_access_bubble::ShowButtonsForType(bubble_type_);
   else
     should_watch_mouse = CanMouseTriggerSlideIn();
 
   if (should_watch_mouse == IsWatchingMouse())
     return;
 
   if (should_watch_mouse)
     StartWatchingMouse();
   else
     StopWatchingMouse();
 }
 
 void ExclusiveAccessBubbleViews::UpdateForImmersiveState() {
-  AnimatedAttribute expected_animated_attribute =
-      ExclusiveAccessManager::IsSimplifiedFullscreenUIEnabled() ||
-              bubble_view_context_->IsImmersiveModeEnabled()
-          ? ANIMATED_ATTRIBUTE_OPACITY
-          : ANIMATED_ATTRIBUTE_BOUNDS;
+  AnimatedAttribute expected_animated_attribute = ExpectedAnimationAttribute();
   if (animated_attribute_ != expected_animated_attribute) {
     // If an animation is currently in progress, skip to the end because
     // switching the animated attribute midway through the animation looks
     // weird.
     animation_->End();
 
     animated_attribute_ = expected_animated_attribute;
 
     // We may have finished hiding |popup_|. However, the bounds animation
     // assumes |popup_| has the opacity when it is fully shown and the opacity
@@ skipping 40 matching lines @@
 }
 
 void ExclusiveAccessBubbleViews::AnimationEnded(
     const gfx::Animation* animation) {
   AnimationProgressed(animation);
 }
 
 gfx::Rect ExclusiveAccessBubbleViews::GetPopupRect(
     bool ignore_animation_state) const {
   gfx::Size size(view_->GetPreferredSize());
-  gfx::Rect widget_bounds = bubble_view_context_->GetBubbleAssociatedWidget()
-                                ->GetClientAreaBoundsInScreen();
+  gfx::Rect widget_bounds = bubble_view_context_->GetClientAreaBoundsInScreen();
   int x = widget_bounds.x() + (widget_bounds.width() - size.width()) / 2;
 
   int top_container_bottom = widget_bounds.y();
   if (bubble_view_context_->IsImmersiveModeEnabled()) {
     // Skip querying the top container height in non-immersive fullscreen
     // because:
     // - The top container height is always zero in non-immersive fullscreen.
     // - Querying the top container height may return the height before entering
     //   fullscreen because layout is disabled while entering fullscreen.
     // A visual glitch due to the delayed layout is avoided in immersive
@@ skipping 15 matching lines @@
     int total_height = size.height() + desired_top;
     int popup_bottom = animation_->CurrentValueBetween(total_height, 0);
     int y_offset = std::min(popup_bottom, desired_top);
     size.set_height(size.height() - popup_bottom + y_offset);
     y -= y_offset;
   }
   return gfx::Rect(gfx::Point(x, y), size);
 }
 
 gfx::Point ExclusiveAccessBubbleViews::GetCursorScreenPoint() {
-  gfx::Point cursor_pos = gfx::Screen::GetScreen()->GetCursorScreenPoint();
-  views::View::ConvertPointFromScreen(GetBrowserRootView(), &cursor_pos);
-  return cursor_pos;
+  return bubble_view_context_->GetCursorPointInParent();
 }
 
 bool ExclusiveAccessBubbleViews::WindowContainsPoint(gfx::Point pos) {
   return GetBrowserRootView()->HitTestPoint(pos);
 }
 
 bool ExclusiveAccessBubbleViews::IsWindowActive() {
   return bubble_view_context_->GetBubbleAssociatedWidget()->IsActive();
 }
 
@@ skipping 21 matching lines @@
     const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_FULLSCREEN_CHANGED, type);
   UpdateForImmersiveState();
 }
 
 void ExclusiveAccessBubbleViews::OnWidgetVisibilityChanged(
     views::Widget* widget,
     bool visible) {
   UpdateMouseWatcher();
 }