NTP: Use the store as the last thumbnail in case we have no apps installed....

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"
@@ skipping 52 matching lines @@
   DCHECK(NotificationType::PREF_CHANGED == type);
   std::wstring* pref_name = Details<std::wstring>(details).ptr();
   DCHECK(*pref_name == prefs::kNTPShownSections);
 
   int sections = pref_service_->GetInteger(prefs::kNTPShownSections);
   FundamentalValue sections_value(sections);
   dom_ui_->CallJavascriptFunction(L"setShownSections", sections_value);
 }
 
 void ShownSectionsHandler::HandleGetShownSections(const Value* value) {
-  SetFirstAppLauncherRunPref(pref_service_);
   int sections = pref_service_->GetInteger(prefs::kNTPShownSections);
   FundamentalValue sections_value(sections);
   dom_ui_->CallJavascriptFunction(L"onShownSections", sections_value);
 }
 
 void ShownSectionsHandler::HandleSetShownSections(const Value* value) {
   if (!value->IsType(Value::TYPE_LIST)) {
     NOTREACHED();
     return;
   }
@@ skipping 12 matching lines @@
   int mode = StringToInt(mode_string);
   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::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 (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 (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);
 }