Support for ntp promo bubble.

chrome/browser/ui/webui/ntp/ntp_resource_cache.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/ntp_resource_cache.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 403 matching lines @@
       (alignment & ThemeService::ALIGN_RIGHT) ? "right" : "");
 
   // Disable the promo if this is the first run, otherwise set the promo string
   // for display if there is a valid outstanding promo.
   if (first_run::IsChromeFirstRun()) {
     NotificationPromo::HandleClosed(profile_,
                                     NotificationPromo::NTP_NOTIFICATION_PROMO);
   } else {
     NotificationPromo notification_promo(profile_);
     notification_promo.InitFromPrefs(NotificationPromo::NTP_NOTIFICATION_PROMO);
-    if (notification_promo.CanShow())
-      load_time_data.SetString("serverpromo", notification_promo.promo_text());
+    if (notification_promo.CanShow()) {
+      load_time_data.SetString("notificationPromoText",
+                               notification_promo.promo_text());
+      DVLOG(1) << "Notification promo:" << notification_promo.promo_text();
+    }
+
+    NotificationPromo bubble_promo(profile_);
+    bubble_promo.InitFromPrefs(NotificationPromo::NTP_BUBBLE_PROMO);
+    if (bubble_promo.CanShow()) {
+      load_time_data.SetString("bubblePromoText",
+                               bubble_promo.promo_text());
+      DVLOG(1) << "Bubble promo:" << bubble_promo.promo_text();
+    }
   }
 
   // Determine whether to show the menu for accessing tabs on other devices.
   bool show_other_sessions_menu = !CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableNTPOtherSessionsMenu);
   load_time_data.SetBoolean("showOtherSessionsMenu",
                             show_other_sessions_menu);
   load_time_data.SetBoolean("isUserSignedIn",
       !prefs->GetString(prefs::kGoogleServicesUsername).empty());
 
@@ skipping 129 matching lines @@
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           chrome::search::IsInstantExtendedAPIEnabled(profile_) ?
               IDR_NEW_TAB_SEARCH_THEME_CSS : IDR_NEW_TAB_4_THEME_CSS,
           ui::SCALE_FACTOR_NONE));
 
   // Create the string from our template and the replacements.
   std::string css_string;
   css_string = ReplaceStringPlaceholders(new_tab_theme_css, subst, NULL);
   new_tab_css_ = base::RefCountedString::TakeString(&css_string);
 }