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

chrome/browser/notifications/notification.h

 // 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.
 
 #ifndef CHROME_BROWSER_NOTIFICATIONS_NOTIFICATION_H_
 #define CHROME_BROWSER_NOTIFICATIONS_NOTIFICATION_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 20 matching lines @@
   // creates an HTML representation using a data: URL for display.
   Notification(const GURL& origin_url,
                const GURL& icon_url,
                const base::string16& title,
                const base::string16& body,
                blink::WebTextDirection dir,
                const base::string16& display_source,
                const base::string16& replace_id,
                NotificationDelegate* delegate);
 
-  // Initializes a notification with text content and an icon image. Currently
-  // only used on Ash. Does not generate content_url_.
-  Notification(const GURL& origin_url,
-               const gfx::Image& icon,
-               const base::string16& title,
-               const base::string16& body,
-               blink::WebTextDirection dir,
-               const base::string16& display_source,
-               const base::string16& replace_id,
-               NotificationDelegate* delegate);
-
   Notification(
       message_center::NotificationType type,
       const GURL& origin_url,
       const base::string16& title,
       const base::string16& body,
       const gfx::Image& icon,
       blink::WebTextDirection dir,
       const message_center::NotifierId& notifier_id,
       const base::string16& display_source,
       const base::string16& replace_id,
@@ skipping 50 matching lines @@
 
   // The user-supplied replace ID for the notification.
   base::string16 replace_id_;
 
   // A proxy object that allows access back to the JavaScript object that
   // represents the notification, for firing events.
   scoped_refptr<NotificationDelegate> delegate_;
 };
 
 #endif  // CHROME_BROWSER_NOTIFICATIONS_NOTIFICATION_H_