Fix a bug where we would show both the apps and thumb sections

chrome/browser/dom_ui/shown_sections_handler.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/dom_ui/shown_sections_handler.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 
 namespace {
 
 // Will cause an UMA notification if the mode of the new tab page
 // was changed to hide/show the most visited thumbnails.
 void NotifySectionDisabled(int new_mode, int old_mode, Profile *profile) {
   // If the oldmode HAD either thumbs or lists visible.
-  bool old_had_it = (old_mode & THUMB) || (old_mode & LIST);
-  bool new_has_it = (new_mode & THUMB) || (new_mode & LIST);
+  bool old_had_it = old_mode & THUMB;
+  bool new_has_it = new_mode & THUMB;
 
   if (old_had_it && !new_has_it) {
     UserMetrics::RecordAction(
         UserMetricsAction("ShowSections_RecentSitesDisabled"),
         profile);
   }
 
   if (new_has_it && !old_had_it) {
     UserMetrics::RecordAction(
         UserMetricsAction("ShowSections_RecentSitesEnabled"),
         profile);
   }
 }
 
 }  // namespace
 
 // static
 int ShownSectionsHandler::GetShownSections(PrefService* prefs) {
-  int sections = prefs->GetInteger(prefs::kNTPShownSections);
-  sections &= ~RECENT;
-  return sections;
+  return prefs->GetInteger(prefs::kNTPShownSections);
 }
 
 ShownSectionsHandler::ShownSectionsHandler(PrefService* pref_service)
     : pref_service_(pref_service) {
   pref_service_->AddPrefObserver(prefs::kNTPShownSections, this);
 }
 
 ShownSectionsHandler::~ShownSectionsHandler() {
   pref_service_->RemovePrefObserver(prefs::kNTPShownSections, this);
 }
@@ skipping 29 matching lines @@
   int old_mode = pref_service_->GetInteger(prefs::kNTPShownSections);
 
   if (old_mode != mode) {
     NotifySectionDisabled(mode, old_mode, dom_ui_->GetProfile());
     pref_service_->SetInteger(prefs::kNTPShownSections, mode);
   }
 }
 
 // static
 void ShownSectionsHandler::RegisterUserPrefs(PrefService* pref_service) {
-  pref_service->RegisterIntegerPref(prefs::kNTPShownSections,
-                                    THUMB | RECENT | TIPS | SYNC | APPS);
+  pref_service->RegisterIntegerPref(prefs::kNTPShownSections, THUMB);
 }
 
 // static
 void ShownSectionsHandler::MigrateUserPrefs(PrefService* pref_service,
                                             int old_pref_version,
                                             int new_pref_version) {
   bool changed = false;
   int shown_sections = pref_service->GetInteger(prefs::kNTPShownSections);
 
-  if (old_pref_version < 1) {
-    // TIPS was used in early builds of the NNTP but since it was removed before
-    // Chrome 3.0 we want to ensure that it is shown by default.
-    shown_sections |= TIPS | SYNC;
+  if (old_pref_version < 3) {
+    // In version 3, we went from being able to show multiple sections to being
+    // able to show only one expanded at a time. The only two expandable
+    // sections are APPS and THUMBS.
+    if (shown_sections & APPS)
+      shown_sections = APPS;
+    else
+      shown_sections = THUMB;
+
     changed = true;
   }
 
-  if (old_pref_version < 2) {
-    // LIST is no longer used. Change to THUMB.
-    shown_sections &= ~LIST;
-    shown_sections |= THUMB;
-    changed = true;
-  }
-
   if (changed)
     pref_service->SetInteger(prefs::kNTPShownSections, shown_sections);
 }