Merge 48149 - Relanding 48042....

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_util.h"
 #include "base/values.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/extensions/extension.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);
@@ skipping 55 matching lines @@
         prefs::kNTPShownSections, mode);
   }
 }
 
 // static
 void ShownSectionsHandler::SetFirstAppLauncherRunPref(
     PrefService* pref_service) {
   // If we have turned on Apps we want to hide most visited and recent to give
   // more focus to the Apps section. We do not do this in MigrateUserPrefs
   // because the pref version should not depend on command line switches.
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableApps) &&
+  if (Extension::AppsAreEnabled() &&
       !pref_service->GetBoolean(prefs::kNTPAppLauncherFirstRun)) {
     int sections = pref_service->GetInteger(prefs::kNTPShownSections);
     sections &= ~THUMB;
     sections &= ~RECENT;
     pref_service->SetInteger(prefs::kNTPShownSections, sections);
     pref_service->SetBoolean(prefs::kNTPAppLauncherFirstRun, true);
   }
 }
 
 // static
 void ShownSectionsHandler::RegisterUserPrefs(PrefService* pref_service) {
   pref_service->RegisterIntegerPref(prefs::kNTPShownSections,
                                     THUMB | RECENT | TIPS | SYNC);
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableApps)) {
+  if (Extension::AppsAreEnabled()) {
     pref_service->RegisterBooleanPref(prefs::kNTPAppLauncherFirstRun, false);
   }
 }
 
 // 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;
     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);
 }