summaryrefslogtreecommitdiffstats
path: root/chrome/browser/dom_ui/shown_sections_handler.cc
diff options
context:
space:
mode:
authorxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-02 00:01:20 +0000
committerxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-02 00:01:20 +0000
commit515b7155c67f4af2b7ea407880eca65cccd9c284 (patch)
tree9869e68eed72283d9c9e1270aebf0323d50e0c7f /chrome/browser/dom_ui/shown_sections_handler.cc
parentd896a73f79480b96ea80b1827733841a9ab7de43 (diff)
downloadchromium_src-515b7155c67f4af2b7ea407880eca65cccd9c284.zip
chromium_src-515b7155c67f4af2b7ea407880eca65cccd9c284.tar.gz
chromium_src-515b7155c67f4af2b7ea407880eca65cccd9c284.tar.bz2
Skip migrating for default shown sections prefs.
BUG=chromium-os:9737 TEST=Verify fix for chromium-os:9737 Review URL: http://codereview.chromium.org/5494001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67907 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui/shown_sections_handler.cc')
-rw-r--r--chrome/browser/dom_ui/shown_sections_handler.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/dom_ui/shown_sections_handler.cc b/chrome/browser/dom_ui/shown_sections_handler.cc
index 52d3ae6..04d9564 100644
--- a/chrome/browser/dom_ui/shown_sections_handler.cc
+++ b/chrome/browser/dom_ui/shown_sections_handler.cc
@@ -106,6 +106,12 @@ void ShownSectionsHandler::RegisterUserPrefs(PrefService* pref_service) {
void ShownSectionsHandler::MigrateUserPrefs(PrefService* pref_service,
int old_pref_version,
int new_pref_version) {
+ // Nothing to migrate for default kNTPShownSections value.
+ const PrefService::Preference* shown_sections_pref =
+ pref_service->FindPreference(prefs::kNTPShownSections);
+ if (shown_sections_pref->IsDefaultValue())
+ return;
+
bool changed = false;
int shown_sections = pref_service->GetInteger(prefs::kNTPShownSections);