Elide origins displayed on web notifications.

chrome/browser/extensions/api/notifications/notifications_api.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 "chrome/browser/extensions/api/notifications/notifications_api.h"
 
 #include "base/callback.h"
 #include "base/guid.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 287 matching lines @@
       if (icon_bitmap_ptr) {
         NotificationConversionHelper::NotificationBitmapToGfxImage(
             image_scale, bitmap_sizes.button_icon_size, *icon_bitmap_ptr,
             &info.icon);
       }
       optional_fields.buttons.push_back(info);
     }
   }
 
   if (options->context_message) {
-    optional_fields.context_message =
+    optional_fields.context_message.message =
         base::UTF8ToUTF16(*options->context_message);
+    optional_fields.context_message.use_origin_as_context = false;
   }
 
   bool has_image = options->image_bitmap.get() &&
                    NotificationConversionHelper::NotificationBitmapToGfxImage(
                        image_scale, bitmap_sizes.image_size,
                        *options->image_bitmap, &optional_fields.image);
 
   // We should have an image if and only if the type is an image type.
   if (has_image != (type == message_center::NOTIFICATION_TYPE_IMAGE)) {
     SetError(kExtraImageProvided);
@@ skipping 31 matching lines @@
       optional_fields.items.push_back(item);
     }
   }
 
   if (options->is_clickable.get())
     optional_fields.clickable = *options->is_clickable;
 
   NotificationsApiDelegate* api_delegate(new NotificationsApiDelegate(
       this, GetProfile(), extension_->id(), id));  // ownership is passed to
                                                    // Notification
-  Notification notification(type,
-                            extension_->url(),
-                            title,
-                            message,
-                            icon,
-                            message_center::NotifierId(
-                                message_center::NotifierId::APPLICATION,
-                                extension_->id()),
-                            base::UTF8ToUTF16(extension_->name()),
-                            api_delegate->id(),
-                            optional_fields,
-                            api_delegate);
+  Notification notification(
+      type, title, message, icon,
+      message_center::NotifierId(message_center::NotifierId::APPLICATION,
+                                 extension_->id()),
+      base::UTF8ToUTF16(extension_->name()), extension_->url(),
+      api_delegate->id(), optional_fields, api_delegate);
 
   g_browser_process->notification_ui_manager()->Add(notification, GetProfile());
   return true;
 }
 
 bool NotificationsApiFunction::UpdateNotification(
     const std::string& id,
     api::notifications::NotificationOptions* options,
     Notification* notification) {
   NotificationBitmapSizes bitmap_sizes = GetNotificationBitmapSizes();
@@ skipping 53 matching lines @@
             image_scale, bitmap_sizes.button_icon_size, *icon_bitmap_ptr,
             &button.icon);
       }
       buttons.push_back(button);
     }
     notification->set_buttons(buttons);
   }
 
   if (options->context_message) {
     notification->set_context_message(
-        base::UTF8ToUTF16(*options->context_message));
+        base::UTF8ToUTF16(*options->context_message),
+        false /* use_origin_as_context */);
   }
 
   gfx::Image image;
   bool has_image =
       options->image_bitmap.get() &&
       NotificationConversionHelper::NotificationBitmapToGfxImage(
           image_scale, bitmap_sizes.image_size, *options->image_bitmap, &image);
 
   if (has_image) {
     // We should have an image if and only if the type is an image type.
@@ skipping 229 matching lines @@
           ? api::notifications::PERMISSION_LEVEL_GRANTED
           : api::notifications::PERMISSION_LEVEL_DENIED;
 
   SetResult(new base::StringValue(api::notifications::ToString(result)));
   SendResponse(true);
 
   return true;
 }
 
 }  // namespace extensions