Adding new general bubble error message consisting of icon, message and caption. Using this message…

ash/popup_message.cc

Index: ash/popup_message.cc
diff --git a/ash/popup_message.cc b/ash/popup_message.cc
new file mode 100644
index 0000000000000000000000000000000000000000..24689ed4017b165806bf417bc354dd352f9abde6
--- /dev/null
+++ b/ash/popup_message.cc
@@ -0,0 +1,212 @@
+// Copyright (c) 2013 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 "ash/popup_message.h"
+
+#include "ash/wm/window_animations.h"
+#include "grit/ash_resources.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/insets.h"
+#include "ui/views/bubble/bubble_delegate.h"
+#include "ui/views/bubble/bubble_frame_view.h"
+#include "ui/views/controls/image_view.h"
+#include "ui/views/controls/label.h"
+#include "ui/views/layout/box_layout.h"
+#include "ui/views/widget/widget.h"
+
+namespace ash {
+namespace {
+const int kMessageTopBottomMargin = 10;
+const int kMessageLeftRightMargin = 10;
+const int kMessageAppearanceDelay = 200;  // msec

[James Cook, 2013/05/22 12:29:07]

nit: Consider kMessageAppearanceDelayMs, then you don't need the comment

[Mr4D (OOO till 08-26), 2013/05/22 14:57:34]

Done.

+const int kMessageMinHeight = 29 - 2 * kMessageTopBottomMargin;
+const SkColor kMessageTextColor = SkColorSetRGB(0x22, 0x22, 0x22);
+
+// The maximum width of the Message bubble.  Borrowed the value from
+// ash/Message/Message_controller.cc

[James Cook, 2013/05/22 12:29:07]

Message/Message -> message/message

[Mr4D (OOO till 08-26), 2013/05/22 14:57:34]

Done.

+const int kMessageMaxWidth = 250;
+
+// The offset for the Message bubble - making sure that the bubble is flush
+// with the shelf. The offset includes the arrow size in pixels as well as
+// the activation bar and other spacing elements.
+const int kArrowOffsetLeftRight = 11;
+const int kArrowOffsetTopBottom = 7;
+
+// The number of pixels between the icon and the text.
+const int kHorizontalPopupPaddingBetweenItems = 10;
+
+// The number of pixels between the text items.
+const int kVerticalPopupPaddingBetweenItems = 10;
+}  // namespace
+
+// The implementation of Message of the launcher.
+class PopupMessage::MessageBubble : public views::BubbleDelegateView {
+ public:
+  MessageBubble(const base::string16& caption,
+                const base::string16& message,
+                IconType message_type,
+                views::View* anchor,
+                views::BubbleBorder::Arrow arrow_orientation,
+                const gfx::Size& size_override,
+                int arrow_offset);
+
+  void Close();
+
+ private:
+  // views::View overrides:
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
+
+  // Each component (width/height) can force a size override for that component
+ // if not 0.

[James Cook, 2013/05/22 12:29:07]

two space indent

[Mr4D (OOO till 08-26), 2013/05/22 14:57:34]

Done.

+  gfx::Size size_override_;
+
+  DISALLOW_COPY_AND_ASSIGN(MessageBubble);
+};
+
+PopupMessage::MessageBubble::MessageBubble(
+                    const base::string16& caption,

[James Cook, 2013/05/22 12:29:07]

indent

[Mr4D (OOO till 08-26), 2013/05/22 14:57:34]

Done.

+                    const base::string16& message,
+                    IconType message_type,
+                    views::View* anchor,
+                    views::BubbleBorder::Arrow arrow,
+                    const gfx::Size& size_override,
+                    int arrow_offset)
+    : views::BubbleDelegateView(anchor, arrow),
+      size_override_(size_override) {
+  gfx::Insets insets = gfx::Insets(kArrowOffsetTopBottom,
+                                   kArrowOffsetLeftRight,
+                                   kArrowOffsetTopBottom,
+                                   kArrowOffsetLeftRight);
+  // An anchor can have an asymmetrical border for spacing reasons. Adjust the
+  // anchor location for this.
+  if (anchor->border())
+    insets += anchor->border()->GetInsets();
+
+  set_anchor_view_insets(insets);
+  set_close_on_esc(false);
+  set_close_on_deactivate(false);
+  set_use_focusless(true);
+  set_accept_events(false);
+
+  set_margins(gfx::Insets(kMessageTopBottomMargin, kMessageLeftRightMargin,
+                          kMessageTopBottomMargin, kMessageLeftRightMargin));
+  set_shadow(views::BubbleBorder::SMALL_SHADOW);
+
+  ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
+  SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0,
+                                        kHorizontalPopupPaddingBetweenItems));
+
+  // Add the icon to the first column (if there is one).

[James Cook, 2013/05/22 12:29:07]

optional nit: This class could use a little ASCII-art drawing of which item goes
where.

[Mr4D (OOO till 08-26), 2013/05/22 14:57:34]

Done.

+  if (message_type != ICON_NONE) {
+    views::ImageView* icon = new views::ImageView();
+    icon->SetImage(
+        bundle.GetImageNamed(IDR_AURA_WARNING_ICON).ToImageSkia());
+    icon->SetVerticalAlignment(views::ImageView::LEADING);
+    AddChildView(icon);
+  }
+
+  // Create a container for the text items and use it as second column.
+  views::View* details = new views::View();
+  AddChildView(details);
+  details->SetLayoutManager(new views::BoxLayout(
+      views::BoxLayout::kVertical, 0, 0, kVerticalPopupPaddingBetweenItems));
+
+  // The caption label.
+  if (!caption.empty()) {
+    views::Label* caption_label = new views::Label(caption);
+    caption_label->SetMultiLine(true);
+    caption_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+    caption_label->SetFont(bundle.GetFont(ui::ResourceBundle::BoldFont));
+    caption_label->SetEnabledColor(kMessageTextColor);
+    details->AddChildView(caption_label);
+  }
+
+  // The message label.
+  if (!message.empty()) {
+    views::Label* message_label = new views::Label(message);
+    message_label->SetMultiLine(true);
+    message_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+    message_label->SetEnabledColor(kMessageTextColor);
+    details->AddChildView(message_label);
+  }
+  views::BubbleDelegateView::CreateBubble(this);
+
+  // Change the arrow offset if needed.
+  if (arrow_offset) {
+    // With the creation of the bubble, the bubble got already placed (and
+    // possibly re-oriented to fit on the screen). Since it is not possible to
+    // set the arrow offset before the creation, we need to set the offset,
+    // and the orientation variables again and force a re-placement.
+    GetBubbleFrameView()->bubble_border()->set_arrow_offset(arrow_offset);
+    GetBubbleFrameView()->bubble_border()->set_arrow(arrow);
+    SetAlignment(views::BubbleBorder::ALIGN_ARROW_TO_MID_ANCHOR);
+  }
+}
+
+void PopupMessage::MessageBubble::Close() {
+  if (GetWidget())
+    GetWidget()->Close();
+}
+
+gfx::Size PopupMessage::MessageBubble::GetPreferredSize() {
+  gfx::Size pref_size = views::BubbleDelegateView::GetPreferredSize();
+  // Override the size with either the provided size or adjust it to not
+  // violate our minimum / maximum sizes.
+  if (size_override_.height())
+    pref_size.set_height(size_override_.height());
+  else if (pref_size.height() < kMessageMinHeight)
+    pref_size.set_height(kMessageMinHeight);
+
+  if (size_override_.width())
+    pref_size.set_width(size_override_.width());
+  else if (pref_size.width() > kMessageMaxWidth)
+    pref_size.set_width(kMessageMaxWidth);
+
+  return pref_size;
+}
+
+PopupMessage::PopupMessage(const base::string16& caption,
+                           const base::string16& message,
+                           IconType message_type,
+                           views::View* anchor,
+                           views::BubbleBorder::Arrow arrow,
+                           const gfx::Size& size_override,
+                           int arrow_offset)
+    : view_(NULL) {
+  view_ = new MessageBubble(
+      caption, message, message_type, anchor, arrow, size_override,
+      arrow_offset);
+  widget_ = view_->GetWidget();
+
+  gfx::NativeView native_view = widget_->GetNativeView();
+  views::corewm::SetWindowVisibilityAnimationType(
+      native_view, views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_VERTICAL);
+  views::corewm::SetWindowVisibilityAnimationTransition(
+      native_view, views::corewm::ANIMATE_HIDE);
+  view_->GetWidget()->Show();
+}
+
+PopupMessage::~PopupMessage() {
+  CancelHidingAnimation();
+  Close();
+}
+
+void PopupMessage::Close() {
+  if (view_) {
+    view_->Close();
+    view_ = NULL;
+    widget_ = NULL;
+  }
+}
+
+void PopupMessage::CancelHidingAnimation() {

[James Cook, 2013/05/22 12:29:07]

Do you think this would be more clear with a single Close(bool animate)
function?  Or a CloseImpl(bool animate)?  It feels a little weird to set up a
hide animation in the constructor, then cancel it.

[Mr4D (OOO till 08-26), 2013/05/22 14:57:34]

Well... 
a. I have found this somewhere else and took the same bahavior.
b. Since this cannot be called directly but is called from the destructor this
seems fine.
As such the way to do it is: Call close if you want an animation or destroy
immediately (without close) to immediately let it go away. So maybe Close()
should get renamed to AnimatedClose() - but even then it is still not clear that
when the destructor gets called the animation will not be called and or
continues to run. 
Adding a parameter to Close however would not make this any clearer since the
cancelling takes place on destruction (if close wasn't called before). 

Since this was done this way in another place I felt obliged to keep it this
way, but if you feel strongly I could can it.

+  if (!widget_ || !widget_->GetNativeView())
+    return;
+
+  gfx::NativeView native_view = widget_->GetNativeView();
+  views::corewm::SetWindowVisibilityAnimationTransition(
+      native_view, views::corewm::ANIMATE_NONE);
+}
+
+}  // namespace ash