ntp4: make default

chrome/browser/extensions/apps_promo.cc

 // Copyright (c) 2011 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/extensions/apps_promo.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 101 matching lines @@
 }
 
 // static
 GURL AppsPromo::GetPromoLink() {
   return GURL(GetStringPref(prefs::kNTPWebStorePromoLink,
                             "https://chrome.google.com/webstore"));
 }
 
 // static
 GURL AppsPromo::GetPromoLogo() {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage4)) {
-    PrefService* local_state = g_browser_process->local_state();
-    GURL logo_url(local_state->GetString(prefs::kNTPWebStorePromoLogo));
-    return logo_url;
-  }
-
-  // TODO(estade): rip this out after ntp4 is default.
   PrefService* local_state = g_browser_process->local_state();
   GURL logo_url(local_state->GetString(prefs::kNTPWebStorePromoLogo));
   if (logo_url.is_valid() && logo_url.SchemeIs("data"))
     return logo_url;
   return GURL(kDefaultPromoLogo);
 }
 
 // static
 std::string AppsPromo::GetPromoExpireText() {
   return GetStringPref(prefs::kNTPWebStorePromoExpire, "No thanks.");
@@ skipping 150 matching lines @@
 bool AppsPromo::GetDefaultAppsInstalled() const {
   return prefs_->GetBoolean(prefs::kDefaultAppsInstalled);
 }
 
 AppsPromo::UserGroup AppsPromo::GetCurrentUserGroup() const {
   const PrefService::Preference* last_promo_id
       = prefs_->FindPreference(prefs::kNTPWebStorePromoLastId);
   CHECK(last_promo_id);
   return last_promo_id->IsDefaultValue() ? USERS_NEW : USERS_EXISTING;
 }