summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpeter <peter@chromium.org>2014-09-18 11:18:40 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-18 18:18:58 +0000
commit4542ea08cfd1c978f8e3ec27d797e0945aba0cf1 (patch)
tree761aaf78c7bb8599c31f8511b9b54e711c46a33a
parent350ce8afc8e4a34c1bb2f51659a7ae9c329a7918 (diff)
downloadchromium_src-4542ea08cfd1c978f8e3ec27d797e0945aba0cf1.zip
chromium_src-4542ea08cfd1c978f8e3ec27d797e0945aba0cf1.tar.gz
chromium_src-4542ea08cfd1c978f8e3ec27d797e0945aba0cf1.tar.bz2
Remove Notification::small_image_url_ as it has no users.
Also removes two methods from Notification which only forward calls to the delegate, and have a single call-site. BUG= Review URL: https://codereview.chromium.org/574273003 Cr-Commit-Position: refs/heads/master@{#295499}
-rw-r--r--chrome/browser/notifications/message_center_notification_manager.cc4
-rw-r--r--chrome/browser/notifications/notification.h8
2 files changed, 2 insertions, 10 deletions
diff --git a/chrome/browser/notifications/message_center_notification_manager.cc b/chrome/browser/notifications/message_center_notification_manager.cc
index 28c5f79..ed49503 100644
--- a/chrome/browser/notifications/message_center_notification_manager.cc
+++ b/chrome/browser/notifications/message_center_notification_manager.cc
@@ -408,7 +408,7 @@ void MessageCenterNotificationManager::ImageDownloads::StartDownloadWithImage(
if (url.is_empty())
return;
- content::WebContents* contents = notification.GetWebContents();
+ content::WebContents* contents = notification.delegate()->GetWebContents();
if (!contents) {
LOG(WARNING) << "Notification needs an image but has no WebContents";
return;
@@ -479,7 +479,7 @@ void MessageCenterNotificationManager::ProfileNotification::StartDownloads() {
void
MessageCenterNotificationManager::ProfileNotification::OnDownloadsCompleted() {
- notification_.DoneRendering();
+ notification_.delegate()->ReleaseRenderViewHost();
}
void
diff --git a/chrome/browser/notifications/notification.h b/chrome/browser/notifications/notification.h
index 4c66aac..4140f70 100644
--- a/chrome/browser/notifications/notification.h
+++ b/chrome/browser/notifications/notification.h
@@ -74,11 +74,6 @@ class Notification : public message_center::Notification {
// Id of the delegate embedded inside this instance.
std::string delegate_id() const { return delegate()->id(); }
- content::WebContents* GetWebContents() const {
- return delegate()->GetWebContents();
- }
- void DoneRendering() { delegate()->ReleaseRenderViewHost(); }
-
NotificationDelegate* delegate() const { return delegate_.get(); }
private:
@@ -96,9 +91,6 @@ class Notification : public message_center::Notification {
// The URL of a large image to be displayed for a a rich notification.
GURL image_url_;
- // The URL of a small image to be displayed for a a rich notification.
- GURL small_image_url_;
-
// The user-supplied replace ID for the notification.
base::string16 replace_id_;