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

chrome/browser/ui/webui/ntp/new_tab_page_handler.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_page_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
@@ skipping 150 matching lines @@
                                            DictionaryValue* values) {
   values->SetInteger("most_visited_page_id", MOST_VISITED_PAGE_ID);
   values->SetInteger("apps_page_id", APPS_PAGE_ID);
   values->SetInteger("suggestions_page_id", SUGGESTIONS_PAGE_ID);
 
   PrefService* prefs = profile->GetPrefs();
   int shown_page = prefs->GetInteger(prefs::kNtpShownPage);
   values->SetInteger("shown_page_type", shown_page & ~INDEX_MASK);
   values->SetInteger("shown_page_index", shown_page & INDEX_MASK);
 
+#if !defined(USE_AURA)
+  // Only show intro bubble for non-aura build.
+
   PrefService* local_state = g_browser_process->local_state();
   int intro_displays = local_state->GetInteger(prefs::kNtp4IntroDisplayCount);
   // This preference used to exist in profile, so check the profile if it has
   // not been set in local state yet.
   if (!intro_displays) {
     prefs->RegisterIntegerPref(prefs::kNtp4IntroDisplayCount, 0,
                                PrefService::UNSYNCABLE_PREF);
     intro_displays = prefs->GetInteger(prefs::kNtp4IntroDisplayCount);
     if (intro_displays)
       local_state->SetInteger(prefs::kNtp4IntroDisplayCount, intro_displays);
   }
   if (intro_displays <= kIntroDisplayMax) {
     values->SetString("ntp4_intro_message",
                       l10n_util::GetStringUTF16(IDS_NTP4_INTRO_MESSAGE));
     values->SetString("ntp4_intro_url", kNtp4IntroURL);
     values->SetString("learn_more",
                       l10n_util::GetStringUTF16(IDS_LEARN_MORE));
   }
+#endif
 }
 
 // static
 void NewTabPageHandler::DismissIntroMessage(PrefService* prefs) {
   prefs->SetInteger(prefs::kNtp4IntroDisplayCount, kIntroDisplayMax + 1);
   // No need to send notification to update resource cache, because this method
   // is only called during startup before the ntp resource cache is constructed.
 }
 
 void NewTabPageHandler::Notify(chrome::NotificationType notification_type) {
   content::NotificationService* service =
       content::NotificationService::current();
   service->Notify(notification_type,
                   content::Source<NewTabPageHandler>(this),
                   content::NotificationService::NoDetails());
 }