Add a second kind of WebContentsView called BaseFormatView that displays two extra fields. Both the view and the two fields are contrived for the purposes of getting the design right before diving into UI polish/fit.

Notes:

  - Notification and WebNotification need to be unified into a single structure. Once WebNotification moves out of ash/, it serves no separate purpose anymore. This work is blocked on that move (see http://codereview.chromium.org/11229022/).

Review URL: https://chromiumcodereview.appspot.com/11196009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165786 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 121 insertions, 0 deletions

diff --git a/ui/message_center/base_format_view.cc b/ui/message_center/base_format_view.cc
new file mode 100644
index 0000000..eed11f4
--- /dev/null
+++ b/ui/message_center/base_format_view.cc
@@ -0,0 +1,121 @@
+// 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 "ui/message_center/base_format_view.h"
+
+#include "grit/ui_resources.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/views/controls/button/image_button.h"
+#include "ui/views/controls/image_view.h"
+#include "ui/views/controls/label.h"
+#include "ui/views/layout/grid_layout.h"
+
+namespace message_center {
+
+const SkColor kNotificationColor = SkColorSetRGB(0xfe, 0xfe, 0xfe);
+const SkColor kNotificationReadColor = SkColorSetRGB(0xfa, 0xfa, 0xfa);
+
+BaseFormatView::BaseFormatView(
+    NotificationList::Delegate* list_delegate,
+    const NotificationList::Notification& notification)
+    : MessageView(list_delegate, notification) {
+}
+
+BaseFormatView::BaseFormatView() {
+}
+
+BaseFormatView::~BaseFormatView() {
+}
+
+void BaseFormatView::SetUpView() {
+  SkColor bg_color = notification_.is_read ?
+      kNotificationReadColor : kNotificationColor;
+  set_background(views::Background::CreateSolidBackground(bg_color));
+  SetPaintToLayer(true);
+  SetFillsBoundsOpaquely(false);
+
+  icon_ = new views::ImageView;
+  icon_->SetImageSize(
+      gfx::Size(kWebNotificationIconSize, kWebNotificationIconSize));
+  icon_->SetImage(notification_.image);
+
+  views::Label* title = new views::Label(notification_.title);
+  title->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+  title->SetFont(title->font().DeriveFont(0, gfx::Font::BOLD));
+
+  views::Label* extra_field = new views::Label(notification_.extra_field);
+  extra_field->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+  views::Label* second_extra_field =
+      new views::Label(notification_.second_extra_field);
+  second_extra_field->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+
+  views::Label* message = new views::Label(notification_.message);
+  message->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+  message->SetMultiLine(true);
+
+  close_button_ = new views::ImageButton(this);
+  close_button_->SetImage(
+      views::CustomButton::BS_NORMAL,
+      ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+          IDR_MESSAGE_CLOSE));
+  close_button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
+                                   views::ImageButton::ALIGN_MIDDLE);
+
+  views::GridLayout* layout = new views::GridLayout(this);
+  SetLayoutManager(layout);
+
+  views::ColumnSet* columns = layout->AddColumnSet(0);
+
+  const int padding_width = kPaddingHorizontal / 2;
+  columns->AddPaddingColumn(0, padding_width);
+
+  // Notification Icon.
+  columns->AddColumn(views::GridLayout::CENTER, views::GridLayout::LEADING,
+                     0, /* resize percent */
+                     views::GridLayout::FIXED,
+                     kWebNotificationIconSize, kWebNotificationIconSize);
+
+  columns->AddPaddingColumn(0, padding_width);
+
+  // Notification message text.
+  const int message_width = kWebNotificationWidth - kWebNotificationIconSize -
+      kWebNotificationButtonWidth - (padding_width * 3);
+  columns->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
+                     100, /* resize percent */
+                     views::GridLayout::FIXED,
+                     message_width, message_width);
+
+  columns->AddPaddingColumn(0, padding_width);
+
+  // Close button.
+  columns->AddColumn(views::GridLayout::CENTER, views::GridLayout::LEADING,
+                     0, /* resize percent */
+                     views::GridLayout::FIXED,
+                     kWebNotificationButtonWidth,
+                     kWebNotificationButtonWidth);
+
+  // Layout rows
+  layout->AddPaddingRow(0, kPaddingBetweenItems);
+
+  layout->StartRow(0, 0);
+  layout->AddView(icon_, 1, 2);
+  layout->AddView(title, 1, 1);
+  layout->AddView(close_button_, 1, 1);
+
+  layout->StartRow(0, 0);
+  layout->SkipColumns(2);
+  layout->AddView(message, 1, 1);
+
+  layout->StartRow(0,0);
+  layout->SkipColumns(1);
+  layout->AddView(extra_field, 1, 1);
+
+  layout->StartRow(0,0);
+  layout->SkipColumns(1);
+  layout->AddView(second_extra_field, 1, 1);
+
+  layout->AddPaddingRow(0, kPaddingBetweenItems);
+}
+
+}  // namespace message_center