Merge 47568 - Forget zoom levels set/changed in incognito mode when exiting i...

chrome/browser/host_zoom_map.cc

 // Copyright (c) 2010 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/host_zoom_map.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/scoped_pref_update.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 
 HostZoomMap::HostZoomMap(Profile* profile)
     : profile_(profile),
       updating_preferences_(false) {
   Load();
   registrar_.Add(this, NotificationType::PROFILE_DESTROYED,
                  Source<Profile>(profile));
-  profile_->GetPrefs()->AddPrefObserver(prefs::kPerHostZoomLevels, this);
+  // Don't observe pref changes (e.g. from sync) in Incognito; once we create
+  // the incognito window it should have no further connection to the main
+  // profile/prefs.
+  if (!profile_->IsOffTheRecord())
+    profile_->GetPrefs()->AddPrefObserver(prefs::kPerHostZoomLevels, this);
 }
 
 void HostZoomMap::Load() {
   if (!profile_)
     return;
 
   AutoLock auto_lock(lock_);
   host_zoom_levels_.clear();
   const DictionaryValue* host_zoom_dictionary =
       profile_->GetPrefs()->GetDictionary(prefs::kPerHostZoomLevels);
@@ skipping 31 matching lines @@
     return;
 
   {
     AutoLock auto_lock(lock_);
     if (level == 0)
       host_zoom_levels_.erase(host);
     else
       host_zoom_levels_[host] = level;
   }
 
+  // If we're in incognito mode, don't persist changes to the prefs.  We'll keep
+  // them in memory only so they will be forgotten on exiting incognito.
+  if (profile_->IsOffTheRecord())
+    return;
+
   updating_preferences_ = true;
   {
     ScopedPrefUpdate update(profile_->GetPrefs(), prefs::kPerHostZoomLevels);
     DictionaryValue* host_zoom_dictionary =
         profile_->GetPrefs()->GetMutableDictionary(prefs::kPerHostZoomLevels);
     std::wstring wide_host(UTF8ToWide(host));
     if (level == 0) {
       host_zoom_dictionary->RemoveWithoutPathExpansion(wide_host, NULL);
     } else {
       host_zoom_dictionary->SetWithoutPathExpansion(
@@ skipping 19 matching lines @@
   updating_preferences_ = false;
 }
 
 void HostZoomMap::Shutdown() {
   if (!profile_)
     return;
 
   registrar_.Remove(this,
                     NotificationType::PROFILE_DESTROYED,
                     Source<Profile>(profile_));
-  profile_->GetPrefs()->RemovePrefObserver(prefs::kPerHostZoomLevels, this);
+  if (!profile_->IsOffTheRecord())
+    profile_->GetPrefs()->RemovePrefObserver(prefs::kPerHostZoomLevels, this);
   profile_ = NULL;
 }
 
 void HostZoomMap::Observe(
     NotificationType type,
     const NotificationSource& source,
     const NotificationDetails& details) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
 
   // If the profile is going away, we need to stop using it.
@@ skipping 13 matching lines @@
       return;
     }
   }
 
   NOTREACHED() << "Unexpected preference observed.";
 }
 
 HostZoomMap::~HostZoomMap() {
   Shutdown();
 }