Factor ExclusiveAccessView out to SubtleNotificationView.

chrome/browser/ui/views/subtle_notification_view.cc

Index: chrome/browser/ui/views/subtle_notification_view.cc
diff --git a/chrome/browser/ui/views/subtle_notification_view.cc b/chrome/browser/ui/views/subtle_notification_view.cc
new file mode 100644
index 0000000000000000000000000000000000000000..fc55a0d8b2db4095ed1c35967fab685007d1bc56
--- /dev/null
+++ b/chrome/browser/ui/views/subtle_notification_view.cc
@@ -0,0 +1,204 @@
+// Copyright 2016 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/subtle_notification_view.h"
+
+#include <memory>
+
+#include "base/strings/string_split.h"
+#include "base/strings/utf_string_conversions.h"
+#include "third_party/skia/include/core/SkColor.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/font_list.h"
+#include "ui/views/bubble/bubble_border.h"
+#include "ui/views/controls/label.h"
+#include "ui/views/controls/link.h"
+#include "ui/views/layout/box_layout.h"
+#include "ui/views/widget/widget.h"
+
+namespace {
+
+// Space between the site info label and the link.
+const int kMiddlePaddingPx = 30;
+
+const int kOuterPaddingHorizPx = 40;
+const int kOuterPaddingVertPx = 8;
+
+// Partially-transparent background color.
+const SkColor kBackgroundColor = SkColorSetARGB(0xcc, 0x28, 0x2c, 0x32);
+
+}  // namespace
+
+// Class containing the exit instruction text. Contains fancy styling on the

[msw, 2016/05/18 18:38:32]

nit: remove references to 'exit' (except in examples)

[Matt Giuca, 2016/05/19 01:50:31]

Done.

+// keyboard key (not just a simple label).
+class SubtleNotificationView::InstructionView : public views::View {
+ public:
+  // Creates an InstructionView with specific text. |text| may contain a single
+  // segment delimited by a pair of pipes ('|'); this segment will be displayed
+  // as a keyboard key. e.g., "Press |Esc| to exit" will have "Esc" rendered as
+  // a key.
+  InstructionView(const base::string16& text,
+                  const gfx::FontList& font_list,
+                  SkColor foreground_color,
+                  SkColor background_color);
+
+  void SetText(const base::string16& text);
+
+ private:
+  views::Label* before_key_;
+  views::Label* key_name_label_;
+  views::View* key_name_;
+  views::Label* after_key_;
+
+  DISALLOW_COPY_AND_ASSIGN(InstructionView);
+};
+
+SubtleNotificationView::InstructionView::InstructionView(
+    const base::string16& text,
+    const gfx::FontList& font_list,
+    SkColor foreground_color,
+    SkColor background_color) {
+  // Spacing around the escape key name.

[msw, 2016/05/18 18:38:32]

nit: remove 'escape'

[Matt Giuca, 2016/05/19 01:50:31]

Done.

+  const int kKeyNameMarginHorizPx = 7;
+  const int kKeyNameBorderPx = 1;
+  const int kKeyNameCornerRadius = 2;
+  const int kKeyNamePaddingPx = 5;
+
+  // The |between_child_spacing| is the horizontal margin of the key name.
+  views::BoxLayout* layout = new views::BoxLayout(views::BoxLayout::kHorizontal,
+                                                  0, 0, kKeyNameMarginHorizPx);
+  SetLayoutManager(layout);
+
+  before_key_ = new views::Label(base::string16(), font_list);
+  before_key_->SetEnabledColor(foreground_color);
+  before_key_->SetBackgroundColor(background_color);
+  AddChildView(before_key_);
+
+  key_name_label_ = new views::Label(base::string16(), font_list);
+  key_name_label_->SetEnabledColor(foreground_color);
+  key_name_label_->SetBackgroundColor(background_color);
+
+  key_name_ = new views::View;
+  views::BoxLayout* key_name_layout = new views::BoxLayout(
+      views::BoxLayout::kHorizontal, kKeyNamePaddingPx, 0, 0);
+  key_name_layout->set_minimum_cross_axis_size(
+      key_name_label_->GetPreferredSize().height() + kKeyNamePaddingPx * 2);
+  key_name_->SetLayoutManager(key_name_layout);
+  key_name_->AddChildView(key_name_label_);
+  // The key name has a border around it.
+  std::unique_ptr<views::Border> border(views::Border::CreateRoundedRectBorder(
+      kKeyNameBorderPx, kKeyNameCornerRadius, foreground_color));
+  key_name_->SetBorder(std::move(border));
+  AddChildView(key_name_);
+
+  after_key_ = new views::Label(base::string16(), font_list);
+  after_key_->SetEnabledColor(foreground_color);
+  after_key_->SetBackgroundColor(background_color);
+  AddChildView(after_key_);
+
+  SetText(text);
+}
+
+void SubtleNotificationView::InstructionView::SetText(
+    const base::string16& text) {
+  // Parse |text|, looking for pipe-delimited segment.
+  std::vector<base::string16> segments =
+      base::SplitString(text, base::ASCIIToUTF16("|"), base::TRIM_WHITESPACE,
+                        base::SPLIT_WANT_ALL);
+  // Expect 1 or 3 pieces (either no pipe-delimited segments, or one).
+  DCHECK(segments.size() <= 1 || segments.size() == 3);
+
+  before_key_->SetText(segments.size() ? segments[0] : base::string16());
+
+  if (segments.size() < 3) {
+    key_name_->SetVisible(false);
+    after_key_->SetVisible(false);
+    return;
+  }
+
+  before_key_->SetText(segments[0]);
+  key_name_label_->SetText(segments[1]);
+  key_name_->SetVisible(true);
+  after_key_->SetVisible(true);
+  after_key_->SetText(segments[2]);
+}
+
+SubtleNotificationView::SubtleNotificationView(
+    const base::string16& instruction_text,
+    const base::string16& link_text,
+    views::LinkListener* link_listener)
+    : link_(nullptr), exit_instruction_(nullptr) {
+  const SkColor kForegroundColor = SK_ColorWHITE;
+
+  std::unique_ptr<views::BubbleBorder> bubble_border(new views::BubbleBorder(
+      views::BubbleBorder::NONE, views::BubbleBorder::NO_ASSETS,
+      kBackgroundColor));
+  set_background(new views::BubbleBackground(bubble_border.get()));
+  SetBorder(std::move(bubble_border));
+
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  const gfx::FontList& font_list =
+      rb.GetFontList(ui::ResourceBundle::MediumFont);
+
+  exit_instruction_ = new InstructionView(base::string16(), font_list,
+                                          kForegroundColor, kBackgroundColor);
+
+  link_ = new views::Link();
+  link_->SetFocusBehavior(FocusBehavior::NEVER);
+  link_->set_listener(link_listener);
+  link_->SetFontList(font_list);
+  link_->SetPressedColor(kForegroundColor);
+  link_->SetEnabledColor(kForegroundColor);
+  link_->SetBackgroundColor(kBackgroundColor);
+  link_->SetVisible(false);
+
+  int outer_padding_horiz = kOuterPaddingHorizPx;
+  int outer_padding_vert = kOuterPaddingVertPx;
+  AddChildView(exit_instruction_);
+  AddChildView(link_);
+
+  views::BoxLayout* layout =
+      new views::BoxLayout(views::BoxLayout::kHorizontal, outer_padding_horiz,
+                           outer_padding_vert, kMiddlePaddingPx);
+  SetLayoutManager(layout);
+
+  UpdateContent(instruction_text, link_text);
+}
+
+SubtleNotificationView::~SubtleNotificationView() {}
+
+void SubtleNotificationView::UpdateContent(
+    const base::string16& instruction_text,
+    const base::string16& link_text) {
+  exit_instruction_->SetText(instruction_text);
+  exit_instruction_->SetVisible(!instruction_text.empty());
+  link_->SetText(link_text);
+  link_->SetVisible(!link_text.empty());
+}
+
+// static
+views::Widget* SubtleNotificationView::CreatePopupWidget(
+    gfx::NativeView parent_view,
+    SubtleNotificationView* view,
+    bool accept_events) {
+  // TODO(yzshen): Change to use the new views bubble, BubbleDelegateView.

[msw, 2016/05/18 18:38:32]

nit: remove/reassign TODOs? (somewhat stale at this point...)

[Matt Giuca, 2016/05/19 01:50:31]

Just removed. I think this works fine as it is (I'm not sure what those plans
mentioned were about).

+  // TODO(pkotwicz): When this becomes a views bubble, make sure that this
+  // bubble is ignored by ImmersiveModeControllerAsh::BubbleManager.
+  // Initialize the popup.
+  views::Widget* 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 = parent_view;
+  params.accept_events = accept_events;
+  popup->Init(params);
+  popup->SetContentsView(view);
+  // We set layout manager to nullptr to prevent the widget from sizing its

[msw, 2016/05/18 18:38:31]

nit: this is probably unnecessary w/fade animation; add a TODO to remove.

[Matt Giuca, 2016/05/19 01:50:31]

OK. Note, I'm a little hesitant to remove too much about the sliding animation
because the UX designers have hinted that they're likely to go back to a slide
animation :/

+  // 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);
+
+  return popup;
+}