Don't show the apps page on the NTP if the app launcher is installed.

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 "build/build_config.h"
 
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/lazy_instance.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/defaults.h"
+#include "chrome/browser/extensions/app_launcher.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.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 79 matching lines @@
     web_ui->AddMessageHandler(new MetricsHandler());
 #if !defined(OS_ANDROID)
     web_ui->AddMessageHandler(new NewTabPageHandler());
     if (NewTabUI::IsDiscoveryInNTPEnabled())
       web_ui->AddMessageHandler(new SuggestionsHandler());
     // Android doesn't have a sync promo/username on NTP.
     if (GetProfile()->IsSyncAccessible())
       web_ui->AddMessageHandler(new NewTabPageSyncHandler());
 
     // Or apps.
-    if (ShouldShowApps()) {

[Evan Stade, 2013/01/25 00:11:02]

revert this

[jeremya, 2013/01/25 00:20:42]

Done.

-      ExtensionService* service = GetProfile()->GetExtensionService();
-      // We might not have an ExtensionService (on ChromeOS when not logged in
-      // for example).
-      if (service)
-        web_ui->AddMessageHandler(new AppLauncherHandler(service));
-    }
+    ExtensionService* service = GetProfile()->GetExtensionService();
+    // We might not have an ExtensionService (on ChromeOS when not logged in
+    // for example).
+    if (service)
+      web_ui->AddMessageHandler(new AppLauncherHandler(service));
 #endif
 
     web_ui->AddMessageHandler(new FaviconWebUIHandler());
   }
 
 #if defined(OS_ANDROID)
   // These handlers are specific to the Android NTP page.
   web_ui->AddMessageHandler(new BookmarksHandler());
   web_ui->AddMessageHandler(new ContextMenuHandler());
   web_ui->AddMessageHandler(new NewTabPageReadyHandler());
@@ skipping 148 matching lines @@
   NewTabPageHandler::RegisterUserPrefs(prefs);
   if (NewTabUI::IsDiscoveryInNTPEnabled())
     SuggestionsHandler::RegisterUserPrefs(prefs);
 #endif
   MostVisitedHandler::RegisterUserPrefs(prefs);
   browser_sync::ForeignSessionHandler::RegisterUserPrefs(prefs);
 }
 
 // static
 bool NewTabUI::ShouldShowApps() {
-#if defined(USE_ASH) || defined(OS_ANDROID)
+#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;
 #else
-  return !CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kShowAppListShortcut);
+  return !extensions::IsAppLauncherEnabled();
 #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 110 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() {}