Always show the NTP apps page

chrome/browser/ui/webui/ntp/new_tab_ui.cc

 // Copyright (c) 2012 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/ui/webui/ntp/new_tab_ui.h"
 
 #include <set>
 
-#include "apps/app_launcher.h"
 #include "base/i18n/rtl.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/metrics_handler.h"
 #include "chrome/browser/ui/webui/ntp/favicon_webui_handler.h"
 #include "chrome/browser/ui/webui/ntp/foreign_session_handler.h"
@@ skipping 25 matching lines @@
 #include "chrome/browser/ui/webui/ntp/android/bookmarks_handler.h"
 #include "chrome/browser/ui/webui/ntp/android/context_menu_handler.h"
 #include "chrome/browser/ui/webui/ntp/android/new_tab_page_ready_handler.h"
 #include "chrome/browser/ui/webui/ntp/android/promo_handler.h"
 #endif
 
 #if defined(ENABLE_THEMES)
 #include "chrome/browser/ui/webui/theme_handler.h"
 #endif
 
+#if defined(USE_ASH)
+#include "chrome/browser/ui/host_desktop.h"
+#endif
+
 using content::BrowserThread;
 using content::RenderViewHost;
 using content::WebUIController;
 
 namespace {
 
 // The amount of time there must be no painting for us to consider painting
 // finished.  Observed times are in the ~1200ms range on Windows.
 const int kTimeoutMs = 2000;
 
@@ skipping 170 matching lines @@
   NewTabPageHandler::RegisterUserPrefs(registry);
   if (NewTabUI::IsDiscoveryInNTPEnabled())
     SuggestionsHandler::RegisterUserPrefs(registry);
 #endif
   MostVisitedHandler::RegisterUserPrefs(registry);
   browser_sync::ForeignSessionHandler::RegisterUserPrefs(registry);
 }
 
 // static
 bool NewTabUI::ShouldShowApps() {
+// Ash shows apps in app list thus should not show apps page in NTP4.
+// Android does not have apps.
 #if defined(OS_ANDROID)
-  // Ash shows apps in app list thus should not show apps page in NTP4.
-  // Android does not have apps.
   return false;
+#elif defined(USE_ASH)
+  return chrome::GetActiveDesktop() != chrome::HOST_DESKTOP_TYPE_ASH;
 #else
-  // This needs to be synchronous, so we use the value the last time it
-  // was checked.
-  return !apps::WasAppLauncherEnabled();
+  return true;
 #endif
 }
 
 // static
 bool NewTabUI::IsDiscoveryInNTPEnabled() {
   // TODO(beaudoin): The flag was removed during a clean-up pass. We leave that
   // here to easily enable it back when we will explore this option again.
   return false;
 }
 
@@ skipping 114 matching lines @@
 void NewTabUI::NewTabHTMLSource::AddResource(const char* resource,
                                              const char* mime_type,
                                              int resource_id) {
   DCHECK(resource);
   DCHECK(mime_type);
   resource_map_[std::string(resource)] =
       std::make_pair(std::string(mime_type), resource_id);
 }
 
 NewTabUI::NewTabHTMLSource::~NewTabHTMLSource() {}