summaryrefslogtreecommitdiffstats
path: root/chrome/browser/notifications/desktop_notification_service.cc
diff options
context:
space:
mode:
authorzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-12 05:41:39 +0000
committerzork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-12 05:41:39 +0000
commitac579882736d975f12036fa718f4080aa41e5e14 (patch)
tree36900f1103b8a1a594cfef82f19820293ec5cc7d /chrome/browser/notifications/desktop_notification_service.cc
parenta6413746c7dc93abcac5573dad08aa6a07826e6e (diff)
downloadchromium_src-ac579882736d975f12036fa718f4080aa41e5e14.zip
chromium_src-ac579882736d975f12036fa718f4080aa41e5e14.tar.gz
chromium_src-ac579882736d975f12036fa718f4080aa41e5e14.tar.bz2
Revert 44234 - Add notifications to allow desktop notification permissions to be synced.
Fix a bug where sites can be added to allow and deny lists multiple times. BUG=none TEST=Open two browsers with separate profiles. Request permission for notifications on a site on one. Check that the permissions are the same on the other browser. Review URL: http://codereview.chromium.org/1578023 TBR=zork@chromium.org Review URL: http://codereview.chromium.org/1607012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44235 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications/desktop_notification_service.cc')
-rw-r--r--chrome/browser/notifications/desktop_notification_service.cc117
1 files changed, 10 insertions, 107 deletions
diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc
index ef92a76..aa769d3 100644
--- a/chrome/browser/notifications/desktop_notification_service.cc
+++ b/chrome/browser/notifications/desktop_notification_service.cc
@@ -21,11 +21,9 @@
#include "chrome/browser/renderer_host/render_process_host.h"
#include "chrome/browser/renderer_host/render_view_host.h"
#include "chrome/browser/renderer_host/site_instance.h"
-#include "chrome/browser/scoped_pref_update.h"
#include "chrome/browser/tab_contents/infobar_delegate.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/worker_host/worker_process_host.h"
-#include "chrome/common/notification_service.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/render_messages.h"
#include "chrome/common/url_constants.h"
@@ -196,60 +194,32 @@ DesktopNotificationService::DesktopNotificationService(Profile* profile,
: profile_(profile),
ui_manager_(ui_manager) {
InitPrefs();
- StartObserving();
}
DesktopNotificationService::~DesktopNotificationService() {
- StopObserving();
}
// Initialize the cache with the allowed and denied origins, or
// create the preferences if they don't exist yet.
void DesktopNotificationService::InitPrefs() {
PrefService* prefs = profile_->GetPrefs();
- std::vector<GURL> allowed_origins;
- std::vector<GURL> denied_origins;
+ const ListValue* allowed_sites = NULL;
+ const ListValue* denied_sites = NULL;
if (!profile_->IsOffTheRecord()) {
if (!prefs->FindPreference(prefs::kDesktopNotificationAllowedOrigins))
prefs->RegisterListPref(prefs::kDesktopNotificationAllowedOrigins);
- const ListValue* allowed_sites =
- prefs->GetList(prefs::kDesktopNotificationAllowedOrigins);
- if (allowed_sites)
- NotificationsPrefsCache::ListValueToGurlVector(*allowed_sites,
- &allowed_origins);
+ allowed_sites = prefs->GetList(prefs::kDesktopNotificationAllowedOrigins);
if (!prefs->FindPreference(prefs::kDesktopNotificationDeniedOrigins))
prefs->RegisterListPref(prefs::kDesktopNotificationDeniedOrigins);
- const ListValue* denied_sites =
- prefs->GetList(prefs::kDesktopNotificationDeniedOrigins);
- if (denied_sites)
- NotificationsPrefsCache::ListValueToGurlVector(*denied_sites,
- &denied_origins);
+ denied_sites = prefs->GetList(prefs::kDesktopNotificationDeniedOrigins);
}
- prefs_cache_ = new NotificationsPrefsCache();
- prefs_cache_->SetCacheAllowedOrigins(allowed_origins);
- prefs_cache_->SetCacheDeniedOrigins(denied_origins);
+ prefs_cache_ = new NotificationsPrefsCache(allowed_sites, denied_sites);
prefs_cache_->set_is_initialized(true);
}
-void DesktopNotificationService::StartObserving() {
- if (!profile_->IsOffTheRecord()) {
- PrefService* prefs = profile_->GetPrefs();
- prefs->AddPrefObserver(prefs::kDesktopNotificationAllowedOrigins, this);
- prefs->AddPrefObserver(prefs::kDesktopNotificationDeniedOrigins, this);
- }
-}
-
-void DesktopNotificationService::StopObserving() {
- if (!profile_->IsOffTheRecord()) {
- PrefService* prefs = profile_->GetPrefs();
- prefs->RemovePrefObserver(prefs::kDesktopNotificationAllowedOrigins, this);
- prefs->RemovePrefObserver(prefs::kDesktopNotificationDeniedOrigins, this);
- }
-}
-
void DesktopNotificationService::GrantPermission(const GURL& origin) {
DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
PersistPermissionChange(origin, true);
@@ -274,42 +244,6 @@ void DesktopNotificationService::DenyPermission(const GURL& origin) {
origin));
}
-void DesktopNotificationService::Observe(NotificationType type,
- const NotificationSource& source,
- const NotificationDetails& details) {
- DCHECK(NotificationType::PREF_CHANGED == type);
- PrefService* prefs = profile_->GetPrefs();
- std::wstring* name = Details<std::wstring>(details).ptr();
-
- if (0 == name->compare(prefs::kDesktopNotificationAllowedOrigins)) {
- const ListValue* allowed_sites =
- prefs->GetList(prefs::kDesktopNotificationAllowedOrigins);
- std::vector<GURL> allowed_origins;
- NotificationsPrefsCache::ListValueToGurlVector(*allowed_sites,
- &allowed_origins);
- // Schedule a cache update on the IO thread.
- ChromeThread::PostTask(
- ChromeThread::IO, FROM_HERE,
- NewRunnableMethod(
- prefs_cache_.get(),
- &NotificationsPrefsCache::SetCacheAllowedOrigins,
- allowed_origins));
- } else if (0 == name->compare(prefs::kDesktopNotificationDeniedOrigins)) {
- const ListValue* denied_sites =
- prefs->GetList(prefs::kDesktopNotificationDeniedOrigins);
- std::vector<GURL> denied_origins;
- NotificationsPrefsCache::ListValueToGurlVector(*denied_sites,
- &denied_origins);
- // Schedule a cache update on the IO thread.
- ChromeThread::PostTask(
- ChromeThread::IO, FROM_HERE,
- NewRunnableMethod(
- prefs_cache_.get(),
- &NotificationsPrefsCache::SetCacheDeniedOrigins,
- denied_origins));
- }
-}
-
void DesktopNotificationService::PersistPermissionChange(
const GURL& origin, bool is_allowed) {
// Don't persist changes when off the record.
@@ -317,51 +251,20 @@ void DesktopNotificationService::PersistPermissionChange(
return;
PrefService* prefs = profile_->GetPrefs();
-
- StopObserving();
-
- bool allowed_changed = false;
- bool denied_changed = false;
-
ListValue* allowed_sites =
prefs->GetMutableList(prefs::kDesktopNotificationAllowedOrigins);
ListValue* denied_sites =
prefs->GetMutableList(prefs::kDesktopNotificationDeniedOrigins);
StringValue* value = new StringValue(origin.spec());
-
// Remove from one list and add to the other.
if (is_allowed) {
- // Add to the allowed list.
- if (allowed_sites->AppendIfNotPresent(value))
- allowed_changed = true;
-
- // Remove from the denied list.
- if (denied_sites->Remove(*value) != -1)
- denied_changed = true;
+ allowed_sites->Append(value);
+ denied_sites->Remove(*value);
} else {
- // Remove from the allowed list.
- if (allowed_sites->Remove(*value) != -1)
- allowed_changed = true;
-
- // Remove from the denied list.
- if (denied_sites->AppendIfNotPresent(value))
- denied_changed = true;
- }
-
- // Persist the pref if anthing changed, but only send updates for the
- // list that changed.
- if (allowed_changed || denied_changed) {
- if (allowed_changed) {
- ScopedPrefUpdate updateAllowed(
- prefs, prefs::kDesktopNotificationAllowedOrigins);
- }
- if (denied_changed) {
- ScopedPrefUpdate updateDenied(
- prefs, prefs::kDesktopNotificationDeniedOrigins);
- }
- prefs->ScheduleSavePersistentPrefs();
+ allowed_sites->Remove(*value);
+ denied_sites->Append(value);
}
- StartObserving();
+ prefs->ScheduleSavePersistentPrefs();
}
void DesktopNotificationService::RequestPermission(
generated by cgit v1.1 at 2025-03-13 05:09:18 +0000