Keep incognito notification preferences separate from regular ones, and don't...

chrome/browser/notifications/desktop_notification_service.cc

 // Copyright (c) 2009 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 "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
@@ skipping 187 matching lines @@
     Source<Profile>(profile_));
 }
 
 DesktopNotificationService::~DesktopNotificationService() {
 }
 
 // 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();
-  const ListValue* allowed_sites;
-  const ListValue* denied_sites;
+  const ListValue* allowed_sites = NULL;
+  const ListValue* denied_sites = NULL;
 
-  if (!prefs->FindPreference(prefs::kDesktopNotificationAllowedOrigins))
-    prefs->RegisterListPref(prefs::kDesktopNotificationAllowedOrigins);
-  allowed_sites = prefs->GetList(prefs::kDesktopNotificationAllowedOrigins);
+  if (!profile_->IsOffTheRecord()) {
+    if (!prefs->FindPreference(prefs::kDesktopNotificationAllowedOrigins))
+      prefs->RegisterListPref(prefs::kDesktopNotificationAllowedOrigins);
+    allowed_sites = prefs->GetList(prefs::kDesktopNotificationAllowedOrigins);
 
-  if (!prefs->FindPreference(prefs::kDesktopNotificationDeniedOrigins))
-    prefs->RegisterListPref(prefs::kDesktopNotificationDeniedOrigins);
-  denied_sites = prefs->GetList(prefs::kDesktopNotificationDeniedOrigins);
+    if (!prefs->FindPreference(prefs::kDesktopNotificationDeniedOrigins))
+      prefs->RegisterListPref(prefs::kDesktopNotificationDeniedOrigins);
+    denied_sites = prefs->GetList(prefs::kDesktopNotificationDeniedOrigins);
+  }
 
   prefs_cache_ = new NotificationsPrefsCache(allowed_sites, denied_sites);
 
   ExtensionsService* ext_service = profile_->GetExtensionsService();
   if (ext_service) {
     const ExtensionList* extensions = ext_service->extensions();
     for (ExtensionList::const_iterator iter = extensions->begin();
          iter != extensions->end(); ++iter) {
       if ((*iter)->HasApiPermission(Extension::kNotificationPermission)) {
         prefs_cache_->CacheAllowedOrigin((*iter)->url());
@@ skipping 11 matching lines @@
   }
 
   Details<Extension> extension = static_cast<Details<Extension> >(details);
   if (extension->HasApiPermission(Extension::kNotificationPermission)) {
     GrantPermission(extension->url());
   }
 }
 
 void DesktopNotificationService::GrantPermission(const GURL& origin) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
-  PrefService* prefs = profile_->GetPrefs();
-  ListValue* allowed_sites =
-      prefs->GetMutableList(prefs::kDesktopNotificationAllowedOrigins);
-  ListValue* denied_sites =
-      prefs->GetMutableList(prefs::kDesktopNotificationDeniedOrigins);
-  // Remove from the black-list and add to the white-list.
-  StringValue* value = new StringValue(origin.spec());
-  denied_sites->Remove(*value);
-  allowed_sites->Append(value);
-  prefs->ScheduleSavePersistentPrefs();
 
-  // Schedule a cache update on the IO thread.
+  if (!profile_->IsOffTheRecord())
+    PersistPermissionChange(origin, true);
+
   ChromeThread::PostTask(
       ChromeThread::IO, FROM_HERE,
       NewRunnableMethod(
           prefs_cache_.get(), &NotificationsPrefsCache::CacheAllowedOrigin,
           origin));
 }
 
 void DesktopNotificationService::DenyPermission(const GURL& origin) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
-  PrefService* prefs = profile_->GetPrefs();
-  ListValue* allowed_sites =
-      prefs->GetMutableList(prefs::kDesktopNotificationAllowedOrigins);
-  ListValue* denied_sites =
-      prefs->GetMutableList(prefs::kDesktopNotificationDeniedOrigins);
-  StringValue* value = new StringValue(origin.spec());
-  // Remove from the white-list and add to the black-list.
-  allowed_sites->Remove(*value);
-  denied_sites->Append(value);
-  prefs->ScheduleSavePersistentPrefs();
+
+  if (!profile_->IsOffTheRecord())
+    PersistPermissionChange(origin, false);
 
   // Schedule a cache update on the IO thread.
   ChromeThread::PostTask(
       ChromeThread::IO, FROM_HERE,
       NewRunnableMethod(
           prefs_cache_.get(), &NotificationsPrefsCache::CacheDeniedOrigin,
           origin));
 }
 
+void DesktopNotificationService::PersistPermissionChange(
+    const GURL& origin, bool is_allowed) {

[michaeln, 2009/12/01 00:00:07]

maybe DCHECK(!profile_->IsOffTheRecord()), or push this test into the
PersistenPermissionChange method itself to share that last remaing line of code
that can be shared... ala...

if (IsOTR())
  return;

+  PrefService* prefs = profile_->GetPrefs();
+  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) {
+    allowed_sites->Append(value);
+    denied_sites->Remove(*value);
+  } else {
+    allowed_sites->Remove(*value);
+    denied_sites->Append(value);
+  }
+  prefs->ScheduleSavePersistentPrefs();
+}
+
 void DesktopNotificationService::RequestPermission(
     const GURL& origin, int process_id, int route_id, int callback_context) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
   // Show an info bar requesting permission.
   Browser* browser = BrowserList::GetLastActive();
   if (!browser) {
     // Reached during ui tests.
     return;
   }
   TabContents* tab = browser->GetSelectedTabContents();
@@ skipping 57 matching lines @@
   if (origin.SchemeIs(chrome::kExtensionScheme)) {
     ExtensionsService* ext_service = profile_->GetExtensionsService();
     if (ext_service) {
       Extension* extension = ext_service->GetExtensionByURL(origin);
       if (extension)
         return ASCIIToWide(extension->name());
     }
   }
   return UTF8ToWide(origin.spec());
 }