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

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>
 
@@ skipping 104 matching lines @@
     web_ui->AddMessageHandler(new MostVisitedHandler());
     if (NewTabUI::IsSuggestionsPageEnabled())
       web_ui->AddMessageHandler(new SuggestionsHandler());
     web_ui->AddMessageHandler(new RecentlyClosedTabsHandler());
     web_ui->AddMessageHandler(new MetricsHandler());
 #if !defined(OS_ANDROID)
     // Android doesn't have a sync promo/username on NTP.
     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());
   }
 
   if (NTPLoginHandler::ShouldShow(GetProfile()))
     web_ui->AddMessageHandler(new NTPLoginHandler());
 
   // Initializing the CSS and HTML can require some CPU, so do it after
   // we've hooked up the most visited handler.  This allows the DB query
@@ skipping 141 matching lines @@
 }
 
 // static
 bool NewTabUI::ShouldShowAppInstallHint() {
   const CommandLine* cli = CommandLine::ForCurrentProcess();
   return cli->HasSwitch(switches::kNtpAppInstallHint) ||
       WebStoreLinkExperimentGroupIs(g_hint_group);
 }
 
 // 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);
 }
 
 // static
 void NewTabUI::SetURLTitleAndDirection(DictionaryValue* dictionary,
                                        const string16& title,
                                        const GURL& gurl) {
   dictionary->SetString("url", gurl.spec());
@@ skipping 92 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);
 }