summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortyoshino@chromium.org <tyoshino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-07 06:58:56 +0000
committertyoshino@chromium.org <tyoshino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-07 06:58:56 +0000
commitefeb0bc25e2c35af2875e6a0ea2f9aa46e23ca22 (patch)
treecce0e40150649edc08c48695ca0cadc35798f537
parentc32e27083ff530651d7e03cff7e7bc05bac55359 (diff)
downloadchromium_src-efeb0bc25e2c35af2875e6a0ea2f9aa46e23ca22.zip
chromium_src-efeb0bc25e2c35af2875e6a0ea2f9aa46e23ca22.tar.gz
chromium_src-efeb0bc25e2c35af2875e6a0ea2f9aa46e23ca22.tar.bz2
[Notification] Stop calling detachPresenter().
It's empty on Blink side now. Rather than implementing it or leave it empty, just stop calling it. In Chromium, content::NotificationProvider never goes away. BUG=none Review URL: https://codereview.chromium.org/36073007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233519 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/renderer/active_notification_tracker.cc10
-rw-r--r--content/renderer/active_notification_tracker.h4
-rw-r--r--content/renderer/notification_provider.cc1
3 files changed, 0 insertions, 15 deletions
diff --git a/content/renderer/active_notification_tracker.cc b/content/renderer/active_notification_tracker.cc
index a813ea0..ff2d9cf 100644
--- a/content/renderer/active_notification_tracker.cc
+++ b/content/renderer/active_notification_tracker.cc
@@ -66,16 +66,6 @@ void ActiveNotificationTracker::Clear() {
}
}
-void ActiveNotificationTracker::DetachAll() {
- ReverseTable::iterator iter;
- for (iter = reverse_notification_table_.begin();
- iter != reverse_notification_table_.end();
- ++iter) {
- WebNotification notification(iter->first);
- notification.detachPresenter();
- }
-}
-
WebNotificationPermissionCallback* ActiveNotificationTracker::GetCallback(
int id) {
return callback_table_.Lookup(id);
diff --git a/content/renderer/active_notification_tracker.h b/content/renderer/active_notification_tracker.h
index d4d710a..b6305a5 100644
--- a/content/renderer/active_notification_tracker.h
+++ b/content/renderer/active_notification_tracker.h
@@ -42,10 +42,6 @@ class CONTENT_EXPORT ActiveNotificationTracker {
// Clears out all active notifications. Useful on page navigation.
void Clear();
- // Detaches all active notifications from their presenter. Necessary
- // when the Presenter is destroyed.
- void DetachAll();
-
private:
typedef std::map<blink::WebNotification, int> ReverseTable;
diff --git a/content/renderer/notification_provider.cc b/content/renderer/notification_provider.cc
index 03bd13f..687eceb 100644
--- a/content/renderer/notification_provider.cc
+++ b/content/renderer/notification_provider.cc
@@ -32,7 +32,6 @@ NotificationProvider::NotificationProvider(RenderViewImpl* render_view)
}
NotificationProvider::~NotificationProvider() {
- manager_.DetachAll();
}
bool NotificationProvider::show(const WebNotification& notification) {