Elide origins displayed on web notifications.

ui/message_center/notification.h

 // 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.
 
 #ifndef UI_MESSAGE_CENTER_NOTIFICATION_H_
 #define UI_MESSAGE_CENTER_NOTIFICATION_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 15 matching lines @@
   NotificationItem(const base::string16& title, const base::string16& message);
 };
 
 struct MESSAGE_CENTER_EXPORT ButtonInfo {
   base::string16 title;
   gfx::Image icon;
 
   ButtonInfo(const base::string16& title);
 };
 
+struct MESSAGE_CENTER_EXPORT ContextMessage {

[Jun Mukai, 2015/08/14 17:17:07]

I prefer to keep string16 for context message. Could you:
- move the 'origin_url' field from chrome/browser/notifications/notification.h
to ui/message_center/notification.h
- use this origin_url if context_message is empty (and origin_url isn't
extension origin), apply the url_formatter to the origin_url

[Miguel Garcia, 2015/08/14 18:28:45]

Will give a shot, now that you mention it I recall Peter saying exactly the same
thing about not switching to std::string but I cannot remeber the reasoning,
could you elaborate why not make the change?

[Jun Mukai, 2015/08/17 18:36:14]

string16 is the text representation on UI side, so it's a good design to convert
into string16 at the earliest point and keep it as far as possible -- also it
will reduce the number of conversions / copies.

I think, however, in your new design, this might not satisfy because you want to
the message into a GURL anyways.
That's why I suggested to hold the GURL instance itself, I think it would reduce
the number of conversions between GURL<->string as well.

+  ContextMessage(std::string msg, bool origin)
+      : message(msg), is_origin(origin) {}
+  std::string message;
+  bool is_origin;
+};
+
 class MESSAGE_CENTER_EXPORT RichNotificationData {
  public:
   RichNotificationData();
   RichNotificationData(const RichNotificationData& other);
   ~RichNotificationData();
 
   int priority;
   bool never_timeout;
   base::Time timestamp;
-  base::string16 context_message;
+  ContextMessage context_message;
   gfx::Image image;
   gfx::Image small_image;
   std::vector<NotificationItem> items;
   int progress;
   std::vector<ButtonInfo> buttons;
   bool should_make_spoken_feedback_for_popup_updates;
   bool clickable;
   std::vector<int> vibration_pattern;
   bool silent;
 };
@@ skipping 60 matching lines @@
 
   // This property currently has no effect on non-Android platforms.
   bool silent() const { return optional_fields_.silent; }
   void set_silent(bool silent) { optional_fields_.silent = silent; }
 
   base::Time timestamp() const { return optional_fields_.timestamp; }
   void set_timestamp(const base::Time& timestamp) {
     optional_fields_.timestamp = timestamp;
   }
 
-  const base::string16& context_message() const {
+  const ContextMessage context_message() const {
     return optional_fields_.context_message;
   }
-  void set_context_message(const base::string16& context_message) {
-    optional_fields_.context_message = context_message;
+
+  void set_context_message(const std::string& context_message, bool is_origin) {
+    optional_fields_.context_message.message = context_message;
+    optional_fields_.context_message.is_origin = is_origin;
   }
 
   const std::vector<NotificationItem>& items() const {
     return optional_fields_.items;
   }
   void set_items(const std::vector<NotificationItem>& items) {
     optional_fields_.items = items;
   }
 
   int progress() const { return optional_fields_.progress; }
@@ skipping 99 matching lines @@
   bool is_read_;  // True if this has been seen in the message center.
 
   // A proxy object that allows access back to the JavaScript object that
   // represents the notification, for firing events.
   scoped_refptr<NotificationDelegate> delegate_;
 };
 
 }  // namespace message_center
 
 #endif  // UI_MESSAGE_CENTER_NOTIFICATION_H_