Fix layout glitches in NTP. Also, lots of naming cleanup.

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 <string>
 
 #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/profiles/profile.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.
 // TODO(aa): Needs to be updated to match newest NTP - http://crbug.com/57440
 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 & MINIMIZED_THUMB);
-  bool new_has_it = (new_mode & THUMB) && !(new_mode & MINIMIZED_THUMB);
+  bool old_had_it = (old_mode & THUMB) && !(old_mode & MENU_THUMB);
+  bool new_has_it = (new_mode & THUMB) && !(new_mode & MENU_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"),
@@ skipping 59 matching lines @@
     NotifySectionDisabled(mode, old_mode, dom_ui_->GetProfile());
     pref_service_->SetInteger(prefs::kNTPShownSections, mode);
   }
 }
 
 // static
 void ShownSectionsHandler::RegisterUserPrefs(PrefService* pref_service) {
 #if defined(OS_CHROMEOS)
   // Default to have expanded APPS and all other secions are minimized.
   pref_service->RegisterIntegerPref(prefs::kNTPShownSections,
-                                    APPS | MINIMIZED_THUMB | MINIMIZED_RECENT);
+                                    APPS | MENU_THUMB | MENU_RECENT);
 #else
   pref_service->RegisterIntegerPref(prefs::kNTPShownSections, THUMB);
 #endif
 }
 
 // static
 void ShownSectionsHandler::MigrateUserPrefs(PrefService* pref_service,
                                             int old_pref_version,
                                             int new_pref_version) {
   // Nothing to migrate for default kNTPShownSections value.
@@ skipping 20 matching lines @@
   if (changed)
     pref_service->SetInteger(prefs::kNTPShownSections, shown_sections);
 }
 
 // static
 void ShownSectionsHandler::OnExtensionInstalled(PrefService* prefs,
                                                 const Extension* extension) {
   if (extension->is_app()) {
     int mode = prefs->GetInteger(prefs::kNTPShownSections);
 
-    // De-minimize the apps section.
-    mode &= ~MINIMIZED_APPS;
+    // De-menu-mode the apps section.
+    mode &= ~MENU_APPS;
 
     // Hide any open sections.
     mode &= ~ALL_SECTIONS_MASK;
 
     // Show the apps section.
     mode |= APPS;
 
     prefs->SetInteger(prefs::kNTPShownSections, mode);
   }
 }