Fix system notifications incorrectly marked as type WEB_PAGE

chrome/browser/notifications/platform_notification_service_impl.cc

 // Copyright 2014 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/notifications/platform_notification_service_impl.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics_action.h"
 #include "base/prefs/pref_service.h"
@@ skipping 18 matching lines @@
 #include "components/url_formatter/url_formatter.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/desktop_notification_delegate.h"
 #include "content/public/browser/notification_event_dispatcher.h"
 #include "content/public/browser/platform_notification_context.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/platform_notification_data.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/message_center/notification_types.h"
 #include "ui/message_center/notifier_settings.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "url/url_constants.h"
 
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/notifications/notifier_state_tracker.h"
 #include "chrome/browser/notifications/notifier_state_tracker_factory.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/info_map.h"
 #include "extensions/common/constants.h"
@@ skipping 299 matching lines @@
     Profile* profile,
     const GURL& origin,
     const SkBitmap& icon,
     const content::PlatformNotificationData& notification_data,
     NotificationDelegate* delegate) const {
   // TODO(peter): Icons for Web Notifications are currently always requested for
   // 1x scale, whereas the displays on which they can be displayed can have a
   // different pixel density. Be smarter about this when the API gets updated
   // with a way for developers to specify images of different resolutions.
   Notification notification(
-      origin, notification_data.title, notification_data.body,
-      gfx::Image::CreateFrom1xBitmap(icon), base::UTF8ToUTF16(origin.host()),
-      notification_data.tag, delegate);
+      message_center::NOTIFICATION_TYPE_SIMPLE, notification_data.title,
+      notification_data.body, gfx::Image::CreateFrom1xBitmap(icon),
+      message_center::NotifierId(origin), base::UTF8ToUTF16(origin.host()),
+      origin, notification_data.tag, message_center::RichNotificationData(),
+      delegate);
 
   notification.set_context_message(
       DisplayNameForContextMessage(profile, origin));
   notification.set_vibration_pattern(notification_data.vibration_pattern);
   notification.set_silent(notification_data.silent);
 
   std::vector<message_center::ButtonInfo> buttons;
 
   // Developer supplied buttons.
   for (const auto& action : notification_data.actions)
     buttons.push_back(message_center::ButtonInfo(action.title));
 
 // Android always includes the settings button in all notifications, whereas for
 // desktop only web (not extensions) notifications do.
 #if !defined(OS_ANDROID)
   // The notification Settings button always comes at the end.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kNotificationSettingsButton)) {
     message_center::ButtonInfo settings_button = message_center::ButtonInfo(
         l10n_util::GetStringUTF16(IDS_NOTIFICATION_SETTINGS));
     settings_button.icon =
         ui::ResourceBundle::GetSharedInstance().GetImageNamed(
             IDR_NOTIFICATION_SETTINGS);
     buttons.push_back(settings_button);
   }
 #endif  // !defined(OS_ANDROID)
 
   notification.set_buttons(buttons);
 
-  notification.set_is_web_notification(true);
-
   // On desktop, notifications with require_interaction==true stay on-screen
   // rather than minimizing to the notification center after a timeout.
   // On mobile, this is ignored (notifications are minimized at all times).
   if (notification_data.require_interaction)
     notification.set_never_timeout(true);
 
   return notification;
 }
 
 NotificationUIManager*
@@ skipping 36 matching lines @@
         extensions::ExtensionRegistry::Get(profile)->GetExtensionById(
             origin.host(), extensions::ExtensionRegistry::EVERYTHING);
     DCHECK(extension);
 
     return base::UTF8ToUTF16(extension->name());
   }
 #endif
 
   return base::string16();
 }