Don't save popup blocker whitelist modifications performed while off the reco...

chrome/browser/blocked_popup_container.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/blocked_popup_container.h"
 
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
@@ skipping 137 matching lines @@
 bool BlockedPopupContainer::IsHostWhitelisted(size_t index) const {
   return ConvertHostIndexToIterator(index)->second;
 }
 
 void BlockedPopupContainer::ToggleWhitelistingForHost(size_t index) {
   PopupHosts::const_iterator i(ConvertHostIndexToIterator(index));
   const std::string& host = i->first;
   bool should_whitelist = !i->second;
   popup_hosts_[host] = should_whitelist;
 
-  ListValue* whitelist_pref =
-      prefs_->GetMutableList(prefs::kPopupWhitelistedHosts);
   if (should_whitelist) {
     whitelist_.insert(host);
-    whitelist_pref->Append(new StringValue(host));
 
     // Open the popups in order.
     for (size_t j = 0; j < blocked_popups_.size();) {
       if (blocked_popups_[j].host == host)
         LaunchPopupAtIndex(j);  // This shifts the rest of the entries down.
       else
         ++j;
     }
   } else {
     // Remove from whitelist.
     whitelist_.erase(host);
-    StringValue host_as_string(host);
-    whitelist_pref->Remove(host_as_string);
 
     for (UnblockedPopups::iterator i(unblocked_popups_.begin());
          i != unblocked_popups_.end(); ) {
       TabContents* tab_contents = i->first;
       TabContentsDelegate* delegate = tab_contents->delegate();
       if ((i->second == host) && delegate->IsPopup(tab_contents)) {
         // Convert the popup back into a blocked popup.
         delegate->DetachContents(tab_contents);
         tab_contents->set_delegate(this);
 
         // Add the popup to the blocked list.  (Do this before the below call!)
         gfx::Rect bounds;
         tab_contents->GetContainerBounds(&bounds);
         blocked_popups_.push_back(BlockedPopup(tab_contents, bounds, host));
 
         // Remove the popup from the unblocked list.
         UnblockedPopups::iterator to_erase = i;
         ++i;
         EraseDataForPopupAndUpdateUI(to_erase);
       } else {
         ++i;
       }
     }
   }
+
+  // Persist whitelisting state if we're not off the record.
+  if (prefs_) {
+    ListValue* whitelist_pref =
+        prefs_->GetMutableList(prefs::kPopupWhitelistedHosts);
+    if (should_whitelist) {
+      whitelist_pref->Append(new StringValue(host));
+    } else {
+      // Stupidly, gcc complains that you're accessing the (private) StringValue
+      // copy constructor if you inline the temp creation into the Remove()
+      // call.
+      StringValue host_value(host);
+      whitelist_pref->Remove(host_value);
+    }
+  }
 }
 
 void BlockedPopupContainer::CloseAll() {
   ClearData();
   HideSelf();
 }
 
 void BlockedPopupContainer::Destroy() {
   view_->Destroy();
 
@@ skipping 174 matching lines @@
                                              Profile* profile)
     : owner_(owner),
       prefs_(profile->GetPrefs()),
       has_been_dismissed_(false),
       view_(NULL),
       profile_(profile) {
   // Copy whitelist pref into local member that's easier to use.
   const ListValue* whitelist_pref =
       prefs_->GetList(prefs::kPopupWhitelistedHosts);
   // Careful: The returned value could be NULL if the pref has never been set.
-  if (whitelist_pref == NULL)
-    return;
-  for (ListValue::const_iterator i(whitelist_pref->begin());
-       i != whitelist_pref->end(); ++i) {
-    std::string host;
-    (*i)->GetAsString(&host);
-    whitelist_.insert(host);
+  if (whitelist_pref != NULL) {
+    for (ListValue::const_iterator i(whitelist_pref->begin());
+         i != whitelist_pref->end(); ++i) {
+      std::string host;
+      (*i)->GetAsString(&host);
+      whitelist_.insert(host);
+    }
   }
+
+  if (profile->IsOffTheRecord())
+    prefs_ = NULL;  // Don't persist any zoom levels.

[Elliot Glaysher, 2009/11/30 17:39:13]

I assume this comment was copy/pasted?

 }
 
 void BlockedPopupContainer::UpdateView() {
   if (blocked_popups_.empty() && unblocked_popups_.empty() &&
       blocked_notices_.empty())
     HideSelf();
   else
     view_->UpdateLabel();
 }
 
 void BlockedPopupContainer::Observe(NotificationType type,
                                     const NotificationSource& source,
                                     const NotificationDetails& details) {
   DCHECK(type == NotificationType::TAB_CONTENTS_DESTROYED);
   TabContents* tab_contents = Source<TabContents>(source).ptr();
   UnblockedPopups::iterator i(unblocked_popups_.find(tab_contents));
   DCHECK(i != unblocked_popups_.end());
   EraseDataForPopupAndUpdateUI(i);
 }