| Index: chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
|
| diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
|
| index a4753966f315b6cb9a5b3a676d858ecd0902f21d..954984ce6edb4fe44c49eaa20a1db03185b8550c 100644
|
| --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
|
| +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
|
| @@ -8,11 +8,9 @@
|
| #include <vector>
|
|
|
| #include "apps/app_launcher.h"
|
| -#include "apps/field_trial_names.h"
|
| #include "apps/pref_names.h"
|
| #include "base/command_line.h"
|
| #include "base/memory/ref_counted_memory.h"
|
| -#include "base/metrics/field_trial.h"
|
| #include "base/prefs/pref_service.h"
|
| #include "base/strings/string16.h"
|
| #include "base/strings/string_number_conversions.h"
|
| @@ -346,15 +344,8 @@ void NTPResourceCache::CreateNewTabHTML() {
|
| ThemeServiceFactory::GetForProfile(profile_)->HasCustomImage(
|
| IDR_THEME_NTP_ATTRIBUTION));
|
| load_time_data.SetBoolean("showMostvisited", should_show_most_visited_page_);
|
| - std::string app_launcher_promo_group_name =
|
| - base::FieldTrialList::FindFullName(apps::kLauncherPromoTrialName);
|
| - bool show_app_launcher_promo =
|
| - !apps::IsAppLauncherEnabled() &&
|
| - local_state->GetBoolean(apps::prefs::kShowAppLauncherPromo) &&
|
| - (app_launcher_promo_group_name == apps::kShowLauncherPromoOnceGroupName ||
|
| - app_launcher_promo_group_name ==
|
| - apps::kResetShowLauncherPromoPrefGroupName);
|
| - load_time_data.SetBoolean("showAppLauncherPromo", show_app_launcher_promo);
|
| + load_time_data.SetBoolean("showAppLauncherPromo",
|
| + apps::ShouldShowAppLauncherPromo());
|
| load_time_data.SetBoolean("showRecentlyClosed",
|
| should_show_recently_closed_menu_);
|
| load_time_data.SetString("title",
|
|
|