Support notifications with custom content

ui/message_center/views/notification_view.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 "ui/message_center/views/notification_view.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 10 matching lines @@
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_types.h"
 #include "ui/message_center/views/bounded_label.h"
 #include "ui/message_center/views/constants.h"
+#include "ui/message_center/views/custom_notification_view.h"
 #include "ui/message_center/views/message_center_controller.h"
 #include "ui/message_center/views/notification_button.h"
 #include "ui/message_center/views/notification_progress_bar.h"
 #include "ui/message_center/views/padded_button.h"
 #include "ui/message_center/views/proportional_image_view.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
@@ skipping 99 matching lines @@
     child_at(i)->SetVisible(visible);
 }
 
 }  // namespace
 
 namespace message_center {
 
 // NotificationView ////////////////////////////////////////////////////////////
 
 // static
 MessageView* NotificationView::Create(MessageCenterController* controller,

[dewittj, 2016/05/16 16:19:28]

Seems weird that this function might return a CustomNotificationView.  Would it
make sense to move this into its own file, and then make the constructor for
NotificationView public?

[xiyuan, 2016/05/16 16:31:05]

Makes sense. How about bring back MessageViewFactory (that we removed in
https://chromiumcodereview.appspot.com/11926032)?

                                       const Notification& notification,
                                       bool top_level) {
+  MessageView* notification_view = nullptr;
   switch (notification.type()) {
     case NOTIFICATION_TYPE_BASE_FORMAT:
     case NOTIFICATION_TYPE_IMAGE:
     case NOTIFICATION_TYPE_MULTIPLE:
     case NOTIFICATION_TYPE_SIMPLE:
     case NOTIFICATION_TYPE_PROGRESS:
+      // All above roads lead to the generic NotificationView.
+      notification_view = new NotificationView(controller, notification);
+      break;
+    case NOTIFICATION_TYPE_CUSTOM:
+      notification_view = new CustomNotificationView(controller, notification);
       break;
     default:
       // If the caller asks for an unrecognized kind of view (entirely possible
       // if an application is running on an older version of this code that
       // doesn't have the requested kind of notification template), we'll fall
       // back to a notification instance that will provide at least basic
       // functionality.
       LOG(WARNING) << "Unable to fulfill request for unrecognized "
                    << "notification type " << notification.type() << ". "
                    << "Falling back to simple notification type.";
+      notification_view = new NotificationView(controller, notification);
   }
 
-  // Currently all roads lead to the generic NotificationView.
-  NotificationView* notification_view =
-      new NotificationView(controller, notification);
-
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   // Don't create shadows for notification toasts on linux wih aura.
   if (top_level)
     return notification_view;
 #endif
 
 #if defined(OS_WIN)
   // Don't create shadows for notifications on Windows under classic theme.
   if (top_level && !ui::win::IsAeroGlassEnabled()) {
     return notification_view;
@@ skipping 573 matching lines @@
 
   return message_line_limit;
 }
 
 int NotificationView::GetMessageHeight(int width, int limit) const {
   return message_view_ ?
          message_view_->GetSizeForWidthAndLines(width, limit).height() : 0;
 }
 
 }  // namespace message_center