Implement fullscreen info bubble on Win and Mac

chrome/browser/ui/views/fullscreen_exit_bubble_views.cc

Index: chrome/browser/ui/views/fullscreen_exit_bubble_views.cc
diff --git a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc
index c48a4565b0a0394d04cb636789351b5968aebe6b..88e71bf5dbe322fa55316f54c85d1a3deeeaaa3c 100644
--- a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc
+++ b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc
@@ -7,6 +7,7 @@
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
+#include "chrome/browser/ui/views/bubble/bubble.h"
 #include "grit/generated_resources.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/keycodes/keyboard_codes.h"
@@ -14,6 +15,8 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/screen.h"
+#include "views/bubble/bubble_border.h"
+#include "views/controls/button/text_button.h"
 #include "views/controls/link.h"
 #include "views/widget/widget.h"
 
@@ -23,28 +26,70 @@
 
 // FullscreenExitView ----------------------------------------------------------
 
-class FullscreenExitBubbleViews::FullscreenExitView : public views::View {
+class FullscreenExitBubbleViews::FullscreenExitView
+    : public views::View,
+      public views::ButtonListener {
  public:
   FullscreenExitView(FullscreenExitBubbleViews* bubble,
-                     const std::wstring& accelerator);
+                     const std::wstring& accelerator,
+                     const GURL& url,
+                     bool ask_permission);
   virtual ~FullscreenExitView();
 
   // views::View
   virtual gfx::Size GetPreferredSize();
 
+  // views::ButtonListener
+  virtual void ButtonPressed(views::Button* sender, const views::Event& event);
+
+  // Hide the accept and deny buttons, exposing the exit link.
+  void HideButtons();
+
  private:
+  string16 GetMessage(const GURL& url);
+
+  // Space between the site info label and the buttons / link.
+  static const int kMiddlePaddingPx = 30;

[Peter Kasting, 2011/10/13 23:48:06]

Nit: Some compilers get angsty about defining class member constants at their
declaration point.  To avoid any hassle here, I'd just stick this at file-scope
inside an anonymous namespace.

[koz (OOO until 15th September), 2011/10/14 00:35:16]

Done.

[koz (OOO until 15th September), 2011/10/14 00:35:16]

Done.

+
   // views::View
   virtual void Layout();
-  virtual void OnPaint(gfx::Canvas* canvas);
+
+  FullscreenExitBubbleViews* bubble_;
 
   // Clickable hint text to show in the bubble.
   views::Link link_;
+  views::Label message_label_;
+  views::NativeTextButton* accept_button_;
+  views::NativeTextButton* deny_button_;
+
+  bool show_buttons_;
 };
 
 FullscreenExitBubbleViews::FullscreenExitView::FullscreenExitView(
     FullscreenExitBubbleViews* bubble,
-    const std::wstring& accelerator) {
+    const std::wstring& accelerator,
+    const GURL& url,
+    bool ask_permission)
+    : bubble_(bubble),
+      accept_button_(NULL),
+      deny_button_(NULL),
+      show_buttons_(ask_permission) {
+  views::BubbleBorder* bubble_border =
+      new views::BubbleBorder(views::BubbleBorder::NONE);
+  bubble_border->set_background_color(Bubble::kBackgroundColor);
+  set_background(new views::BubbleBackground(bubble_border));
+  set_border(bubble_border);
+  set_focusable(false);
+
+  message_label_.set_parent_owned(false);
+  message_label_.SetText(GetMessage(url));
+  message_label_.SetFont(ResourceBundle::GetSharedInstance().GetFont(
+      ResourceBundle::MediumFont));
+  message_label_.SetBackgroundColor(background()->get_color());

[Peter Kasting, 2011/10/13 23:48:06]

Nit: You should call enabled_color() before calling this (as this can change its
result).  You can either move this line down lower, or you can just do:

  SkColor default_text_color(message_label_.enabled_color());
  message_label_.SetBackgroundColor(background()->get_color());
  ...
  link_.SetEnabledColor(default_text_color);

[koz (OOO until 15th September), 2011/10/14 01:06:13]

Done.

+
   link_.set_parent_owned(false);
+  link_.set_collapse_when_hidden(false);
+  link_.set_focusable(false);
 #if !defined(OS_CHROMEOS)
   link_.SetText(
       l10n_util::GetStringFUTF16(IDS_EXIT_FULLSCREEN_MODE,
@@ -54,68 +99,131 @@ FullscreenExitBubbleViews::FullscreenExitView::FullscreenExitView(
 #endif
   link_.set_listener(bubble);
   link_.SetFont(ResourceBundle::GetSharedInstance().GetFont(
-      ResourceBundle::LargeFont));
-  link_.SetBackgroundColor(SK_ColorBLACK);
-  link_.SetEnabledColor(SK_ColorWHITE);
-  link_.SetPressedColor(SK_ColorWHITE);
+      ResourceBundle::MediumFont));
+  link_.SetBackgroundColor(background()->get_color());
+  link_.SetPressedColor(message_label_.enabled_color());

[Peter Kasting, 2011/10/13 23:48:06]

You still want to SetEnabledColor() here like the code used to.

[koz (OOO until 15th September), 2011/10/14 01:06:13]

Done.

+
+  AddChildView(&message_label_);

[Peter Kasting, 2011/10/13 23:48:06]

Nit: Go ahead and do this right after setting up |message_label_| above, for
consistency.

[koz (OOO until 15th September), 2011/10/14 01:06:13]

We've moved message_label_'s SetBackgroundColor() down, so this is immediately
after it now.

   AddChildView(&link_);
+
+  accept_button_ = new views::NativeTextButton(this,
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_FULLSCREEN_INFOBAR_ALLOW)));
+  AddChildView(accept_button_);
+
+  deny_button_ = new views::NativeTextButton(this,
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_FULLSCREEN_INFOBAR_DENY)));
+  AddChildView(deny_button_);
+  accept_button_->set_focusable(false);

[Peter Kasting, 2011/10/13 23:48:06]

Nit: Can you put these two set_focusable() calls above the AddChildView() calls?

[koz (OOO until 15th September), 2011/10/14 01:06:13]

Done.

+  deny_button_->set_focusable(false);
+  link_.SetVisible(false);

[Peter Kasting, 2011/10/13 23:48:06]

Nit: Put this up with the rest of the |link_| setup code

[koz (OOO until 15th September), 2011/10/14 01:06:13]

Done.

+  if (!show_buttons_)

[Peter Kasting, 2011/10/13 23:48:06]

Nit: Blank line above this

[koz (OOO until 15th September), 2011/10/14 01:06:13]

Done.

+    HideButtons();
+}
+
+string16 FullscreenExitBubbleViews::FullscreenExitView::GetMessage(
+    const GURL& url) {
+  if (url.is_empty()) {
+    return l10n_util::GetStringUTF16(
+        IDS_FULLSCREEN_INFOBAR_USER_ENTERED_FULLSCREEN);
+  }
+  if (url.SchemeIsFile())
+    return l10n_util::GetStringUTF16(IDS_FULLSCREEN_INFOBAR_FILE_PAGE_NAME);
+  return l10n_util::GetStringFUTF16(IDS_FULLSCREEN_INFOBAR_REQUEST_PERMISSION,
+      UTF8ToUTF16(url.host()));
 }
 
 FullscreenExitBubbleViews::FullscreenExitView::~FullscreenExitView() {
 }
 
+void FullscreenExitBubbleViews::FullscreenExitView::ButtonPressed(
+    views::Button* sender, const views::Event& event) {
+  if (sender == accept_button_)
+    bubble_->OnAcceptFullscreen();
+  else
+    bubble_->OnCancelFullscreen();
+}
+
+void FullscreenExitBubbleViews::FullscreenExitView::HideButtons() {
+  show_buttons_ = false;
+  accept_button_->SetVisible(false);
+  deny_button_->SetVisible(false);
+  link_.SetVisible(true);
+}
+
 gfx::Size FullscreenExitBubbleViews::FullscreenExitView::GetPreferredSize() {
-  gfx::Size preferred_size(link_.GetPreferredSize());
-  preferred_size.Enlarge(kPaddingPx * 2, kPaddingPx * 2);
-  return preferred_size;
+  gfx::Size link_preferred_size(link_.GetPreferredSize());

[Peter Kasting, 2011/10/13 23:48:06]

Nit: Feel free to remove "preferred_" out of all these variable names here and
in Layout() to save on verbosity -- we use "foo_size" for this kind of thing in
other code.

[koz (OOO until 15th September), 2011/10/14 01:06:13]

Done.

+  gfx::Size site_info_preferred_size(message_label_.GetPreferredSize());
+  gfx::Size accept_preferred_size(accept_button_->GetPreferredSize());
+  gfx::Size deny_preferred_size(deny_button_->GetPreferredSize());
+  gfx::Insets insets(GetInsets());
+
+  int buttons_width = accept_preferred_size.width() + kPaddingPx +
+      deny_preferred_size.width();
+  int button_box_width = std::max(buttons_width, link_preferred_size.width());
+  int width = kPaddingPx + site_info_preferred_size.width() + kMiddlePaddingPx +
+      button_box_width + kPaddingPx;
+
+  gfx::Size result(width + insets.width(),
+      kPaddingPx * 2 + accept_preferred_size.height() + insets.height());
+  return result;
 }
 
 void FullscreenExitBubbleViews::FullscreenExitView::Layout() {
   gfx::Size link_preferred_size(link_.GetPreferredSize());
-  link_.SetBounds(kPaddingPx,
-                  height() - kPaddingPx - link_preferred_size.height(),
-                  link_preferred_size.width(), link_preferred_size.height());
-}
-
-void FullscreenExitBubbleViews::FullscreenExitView::OnPaint(
-    gfx::Canvas* canvas) {
-  // Create a round-bottomed rect to fill the whole View.
-  SkRect rect;
-  SkScalar padding = SkIntToScalar(kPaddingPx);
-  // The "-padding" top coordinate ensures that the rect is always tall enough
-  // to contain the complete rounded corner radius.  If we set this to 0, as the
-  // popup slides offscreen (in reality, squishes to 0 height), the corners will
-  // flatten out as the height becomes less than the corner radius.
-  rect.set(0, -padding, SkIntToScalar(width()), SkIntToScalar(height()));
-  SkScalar rad[8] = { 0, 0, 0, 0, padding, padding, padding, padding };
-  SkPath path;
-  path.addRoundRect(rect, rad, SkPath::kCW_Direction);
-
-  // Fill it black.
-  SkPaint paint;
-  paint.setStyle(SkPaint::kFill_Style);
-  paint.setFlags(SkPaint::kAntiAlias_Flag);
-  paint.setColor(SK_ColorBLACK);
-  canvas->GetSkCanvas()->drawPath(path, paint);
+  gfx::Size site_info_preferred_size(message_label_.GetPreferredSize());
+  gfx::Size accept_preferred_size(accept_button_->GetPreferredSize());
+  gfx::Size deny_preferred_size(deny_button_->GetPreferredSize());
+  gfx::Insets insets(GetInsets());
+
+  int inner_height = height() - insets.height();

[Peter Kasting, 2011/10/13 23:48:06]

Nit: One small issue with this layout is that it looks as if, as you animate the
bubble size, all the controls are going to expand from/contract to the middle of
the bubble (due to your "y / 2" calculations).  If instead you position all the
controls based "height() - padding - control.height()" (effectively "pinning
them" to the bottom), like the old code did, then it will look more like the
bubble contents are sliding onscreen and sliding off, which should look a lot
better.  (I like to test this sort of thing by slowing the slide animation down
to take like 5 seconds total, so I can see the animation very clearly.)

[koz (OOO until 15th September), 2011/10/14 01:06:13]

The bubble size doesn't actually get animated - the containing widget (ie: the
popup)'s height gets animated to zero, but we NULL out its LayoutManager so it
doesn't cause the FullScreenExitBubbleView to change size.

[Peter Kasting, 2011/10/14 01:23:19]

I missed that, oops.

Does that do the right thing?  Won't the contained view then  just always get
laid out at the same y-coordinate, so it will look like the top is pinned and
the bottom is being rolled up, rather than like the whole thing is sliding
offscreen?

[jeremya, 2011/10/14 02:01:49]

We manually set the y-coordinate of the contained view in AnimationProgressed.

[Peter Kasting, 2011/10/14 17:36:52]

I see.  Dang, this is really confusing.  There needs to be a big comment
somewhere (maybe in GetPopupRect()?) that explains the entire animation process
and layout design, and things we do elsewhere can have comments referring
readers over to that.

+  int button_box_x = insets.left() + kPaddingPx +
+      site_info_preferred_size.width() + kMiddlePaddingPx;
+  int site_info_y = insets.top() +
+      (inner_height - site_info_preferred_size.height()) / 2;
+  int link_x = width() - insets.right() - kPaddingPx -
+      link_preferred_size.width();
+  int link_y = insets.top() + (inner_height - link_preferred_size.height()) / 2;
+
+  message_label_.SetBounds(insets.left() + kPaddingPx,

[Peter Kasting, 2011/10/13 23:48:06]

Nit: I think if you just use SetPosition() all these controls will be sized to
their preferred sizes by default.

[koz (OOO until 15th September), 2011/10/14 01:06:13]

Done.

+                           site_info_y,
+                           site_info_preferred_size.width(),
+                           site_info_preferred_size.height());
+  link_.SetBounds(link_x,
+                  link_y,
+                  link_preferred_size.width(),
+                  link_preferred_size.height());
+  if (show_buttons_) {
+    accept_button_->SetBounds(button_box_x,
+                              insets.top() + kPaddingPx,
+                              accept_preferred_size.width(),
+                              accept_preferred_size.height());
+    deny_button_->SetBounds(
+        button_box_x + accept_preferred_size.width() + kPaddingPx,
+        insets.top() + kPaddingPx,
+        deny_preferred_size.width(),
+        deny_preferred_size.height());
+  }
 }
 
 // FullscreenExitBubbleViews ---------------------------------------------------
 
-FullscreenExitBubbleViews::FullscreenExitBubbleViews(
-    views::Widget* frame,
-    CommandUpdater::CommandUpdaterDelegate* delegate)
-    : FullscreenExitBubble(delegate),
+FullscreenExitBubbleViews::FullscreenExitBubbleViews(views::Widget* frame,
+                                                     Browser* browser,
+                                                     const GURL& url,
+                                                     bool ask_permission)
+    : FullscreenExitBubble(browser),
       root_view_(frame->GetRootView()),
       popup_(NULL),
-      size_animation_(new ui::SlideAnimation(this)) {
+      size_animation_(new ui::SlideAnimation(this)),
+      url_(url) {
   size_animation_->Reset(1);
 
   // Create the contents view.
   views::Accelerator accelerator(ui::VKEY_UNKNOWN, false, false, false);
   bool got_accelerator = frame->GetAccelerator(IDC_FULLSCREEN, &accelerator);
   DCHECK(got_accelerator);
-  view_ = new FullscreenExitView(
-      this, UTF16ToWideHack(accelerator.GetShortcutText()));
+  view_ = new FullscreenExitView(this,
+      UTF16ToWideHack(accelerator.GetShortcutText()), url, ask_permission);
 
   // Initialize the popup.
   popup_ = new views::Widget;
@@ -126,11 +234,18 @@ FullscreenExitBubbleViews::FullscreenExitBubbleViews(
   params.parent = frame->GetNativeView();
   params.bounds = GetPopupRect(false);
   popup_->Init(params);
+  gfx::Size size = GetPopupRect(true).size();
   popup_->SetContentsView(view_);
-  popup_->SetOpacity(static_cast<unsigned char>(0xff * kOpacity));
+  // We set layout manager to NULL 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(NULL);
+  view_->SetBounds(0, 0, size.width(), size.height());
   popup_->Show();  // This does not activate the popup.
 
-  StartWatchingMouse();
+  if (!ask_permission)
+    StartWatchingMouse();
 }
 
 FullscreenExitBubbleViews::~FullscreenExitBubbleViews() {
@@ -152,6 +267,16 @@ void FullscreenExitBubbleViews::LinkClicked(
   ToggleFullscreen();
 }
 
+void FullscreenExitBubbleViews::OnAcceptFullscreen() {
+  AcceptFullscreen(url_);
+  view_->HideButtons();
+  StartWatchingMouse();
+}
+
+void FullscreenExitBubbleViews::OnCancelFullscreen() {
+  CancelFullscreen();
+}
+
 void FullscreenExitBubbleViews::AnimationProgressed(
     const ui::Animation* animation) {
   gfx::Rect popup_rect(GetPopupRect(false));
@@ -159,9 +284,11 @@ void FullscreenExitBubbleViews::AnimationProgressed(
     popup_->Hide();
   } else {
     popup_->SetBounds(popup_rect);
+    view_->SetY(popup_rect.height() - view_->height());
     popup_->Show();
   }
 }
+
 void FullscreenExitBubbleViews::AnimationEnded(
     const ui::Animation* animation) {
   AnimationProgressed(animation);
@@ -199,16 +326,21 @@ gfx::Point FullscreenExitBubbleViews::GetCursorScreenPoint() {
 gfx::Rect FullscreenExitBubbleViews::GetPopupRect(
     bool ignore_animation_state) const {
   gfx::Size size(view_->GetPreferredSize());
-  if (!ignore_animation_state) {
-    size.set_height(static_cast<int>(static_cast<double>(size.height()) *
-        size_animation_->GetCurrentValue()));
-  }
   // NOTE: don't use the bounds of the root_view_. On linux changing window
   // size is async. Instead we use the size of the screen.
   gfx::Rect screen_bounds = gfx::Screen::GetMonitorAreaNearestWindow(
       root_view_->GetWidget()->GetNativeView());
   gfx::Point origin(screen_bounds.x() +
                     (screen_bounds.width() - size.width()) / 2,
-                    screen_bounds.y());
+                    kPopupTopPx + screen_bounds.y());
+  if (!ignore_animation_state) {
+    int total_height = size.height() + kPopupTopPx;
+    int animation_height =

[Peter Kasting, 2011/10/13 23:48:06]

Nit: Another way to wrap this is:

    int animation_height = size_animation_->CurrentValueBetween(
        static_cast<double>(total_height), 0.0f);

Also, |animation_height| is kind of a weird and confusing name here.  I don't
really know what name would be better, maybe this just needs a comment about
what it means or something.

[koz (OOO until 15th September), 2011/10/14 01:06:13]

How about popup_bottom?

[Peter Kasting, 2011/10/14 01:23:19]

That would be fine if this were the onscreen y-coordinate of the popup bottom.

I think the core problem here is that |animation_height| means something weird
and so it's hard to find a good name for it.  Perhaps changing its name and its
meaning would make reading this code easier to understand.

+        size_animation_->CurrentValueBetween(static_cast<double>(total_height),
+                                             0.0f);
+    int y_offset = std::min(animation_height, kPopupTopPx);
+    size.set_height(size.height() - animation_height + y_offset);
+    origin.set_y(origin.y() - y_offset);
+  }
   return gfx::Rect(origin, size);
 }