Sync Promo: Add a way to collapse the sync promo

chrome/browser/content_settings/content_settings_pref_provider.cc

 // Copyright (c) 2011 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/content_settings/content_settings_pref_provider.h"
 
 #include <list>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 1013 matching lines @@
     const DictionaryValue* all_settings_dictionary =
       prefs->GetDictionary(prefs::kContentSettingsPatterns);
 
     DictionaryPrefUpdate update(prefs, prefs::kContentSettingsPatternPairs);
     DictionaryValue* exceptions_dictionary;
     exceptions_dictionary = update.Get();
     for (DictionaryValue::key_iterator i(all_settings_dictionary->begin_keys());
          i != all_settings_dictionary->end_keys();
          ++i) {
       const std::string& key(*i);
+      if (key.empty())

[James Hawkins, 2011/07/20 01:55:26]

When does this happen?

[sail, 2011/07/20 19:40:25]

Oops, this is a separate change. Removed.

+        continue;
 
       // Validate pattern string and skip it if it is invalid.
       std::pair<ContentSettingsPattern, ContentSettingsPattern> pattern_pair =
           ParsePatternString(key);
       ContentSettingsPattern primary_pattern = pattern_pair.first;
       if (!primary_pattern.IsValid())
         continue;
 
       // Copy dictionary value.
       // Get old settings.
@@ skipping 42 matching lines @@
       std::string new_key = pattern_pair.first.ToString();
       // Existing values are overwritten.
       obsolete_settings_dictionary->SetWithoutPathExpansion(
           new_key, dictionary->DeepCopy());
     }
   }
   updating_preferences_ = false;
 }
 
 }  // namespace content_settings