aura: Remove apps from NTP4 and disable NTP4 intro bubble.

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

Index: chrome/browser/ui/webui/ntp/new_tab_ui.cc
diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc
index 2fb839fc64afd415f06c35dfc320b1c6afa9747a..c36ab5c93eb8b648fa04d93c0d408518f5a25199 100644
--- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc
+++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc
@@ -122,11 +122,14 @@ NewTabUI::NewTabUI(content::WebUI* web_ui)
     if (GetProfile()->IsSyncAccessible())
       web_ui->AddMessageHandler(new NewTabPageSyncHandler());
 #endif
-    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));
+
+    if (ShouldShowAppsPage()) {
+      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));
+    }
 
     web_ui->AddMessageHandler(new NewTabPageHandler());
     web_ui->AddMessageHandler(new FaviconWebUIHandler());
@@ -288,6 +291,16 @@ bool NewTabUI::ShouldShowAppInstallHint() {
 }
 
 // static
+bool NewTabUI::ShouldShowAppsPage() {
+#if defined(USE_AURA)
+  // Ash shows apps in app list thus should not show apps page in NTP4.
+  return false;

[flackr, 2012/03/05 21:18:53]

Aura compact mode does not have an apps page so we need to return true in this
case as well.

+#else
+  return true;
+#endif
+}
+
+// static
 bool NewTabUI::IsSuggestionsPageEnabled() {
   return CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableSuggestionsTabPage);