Merge two Notification constructors, increase priority of low-battery notification.

chrome/browser/notifications/desktop_notification_service.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/notifications/desktop_notification_service.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 70 matching lines @@
 
 // static
 std::string DesktopNotificationService::AddIconNotification(
     const GURL& origin_url,
     const base::string16& title,
     const base::string16& message,
     const gfx::Image& icon,
     const base::string16& replace_id,
     NotificationDelegate* delegate,
     Profile* profile) {
-  Notification notification(origin_url, icon, title, message,
+  Notification notification(message_center::NOTIFICATION_TYPE_SIMPLE,
+                            origin_url,
+                            title,
+                            message,
+                            icon,
                             blink::WebTextDirectionDefault,
-                            base::string16(), replace_id, delegate);
+                            message_center::NotifierId(origin_url),
+                            base::string16(),
+                            replace_id,
+                            message_center::RichNotificationData(),
+                            delegate);
   g_browser_process->notification_ui_manager()->Add(notification, profile);
   return notification.delegate_id();
 }
 
 DesktopNotificationService::DesktopNotificationService(Profile* profile)
     : PermissionContextBase(profile, CONTENT_SETTINGS_TYPE_NOTIFICATIONS),
       profile_(profile),
       extension_registry_observer_(this),
       weak_factory_(this) {
   OnStringListPrefChanged(
@@ skipping 231 matching lines @@
   // Tell the IO thread that this extension's permission for notifications
   // has changed.
   extensions::InfoMap* extension_info_map =
       extensions::ExtensionSystem::Get(profile_)->info_map();
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&extensions::InfoMap::SetNotificationsDisabled,
                  extension_info_map, notifier_id.id, !enabled));
 #endif
 }