Remove promotion-type-specific JSON handling from NotificationPromo

chrome/browser/web_resource/notification_promo.h

 // 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.
 
 #ifndef CHROME_BROWSER_WEB_RESOURCE_NOTIFICATION_PROMO_H_
 #define CHROME_BROWSER_WEB_RESOURCE_NOTIFICATION_PROMO_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 41 matching lines @@
   // Helpers for NewTabPageHandler.
   // Mark the promo as closed when the user dismisses it.
   static void HandleClosed(Profile* profile, PromoType promo_type);
   // Mark the promo has having been viewed. This returns true if views
   // exceeds the maximum allowed.
   static bool HandleViewed(Profile* profile, PromoType promo_type);
 
   bool new_notification() const { return new_notification_; }
 
   const std::string& promo_text() const { return promo_text_; }
-#if defined(OS_ANDROID) || defined(OS_IOS)
-  const std::string& promo_text_long() const { return promo_text_long_; }
-  const std::string& promo_action_type() const { return promo_action_type_; }
-  const base::ListValue* promo_action_args() const {
-    return promo_action_args_.get();
+  PromoType promo_type() const { return promo_type_; }
+  const base::DictionaryValue* promo_payload() const {
+    return promo_payload_.get();
   }
-#endif  // defined(OS_ANDROID) || defined(OS_IOS)
 
   // Register preferences.
   static void RegisterUserPrefs(PrefService* prefs);
 
  private:
   // For testing.
   friend class NotificationPromoTest;
+  friend class NotificationPromoMobileNtpTest;
 
   // Check if this promo notification is new based on start/end times,
   // and trigger events accordingly.
   void CheckForNewNotification();
 
   // Actions on receiving a new promo notification.
   void OnNewNotification();
 
   // Flush data members to prefs for storage.
   void WritePrefs();
 
   // Tests group_ against max_group_.
   // When max_group_ is 0, all groups pass.
   bool ExceedsMaxGroup() const;
 
   // Tests views_ against max_views_.
   // When max_views_ is 0, we don't cap the number of views.
   bool ExceedsMaxViews() const;
 
   // True if this promo is not targeted to G+ users, or if this is a G+ user.
   bool IsGPlusRequired() const;
 
   Profile* profile_;
   PrefService* prefs_;
 
   PromoType promo_type_;
   std::string promo_text_;
-#if defined(OS_ANDROID) || defined(OS_IOS)
-  std::string promo_text_long_;
-  std::string promo_action_type_;
-  scoped_ptr<base::ListValue> promo_action_args_;
-#endif  // defined(OS_ANDROID) || defined(OS_IOS)
+  scoped_ptr<const base::DictionaryValue> promo_payload_;

[achuithb, 2012/08/17 22:55:12]

Let's add a comment here saying that this is currently not used on desktop.

[aruslan, 2012/08/20 15:36:53]

Done.

 
   double start_;
   double end_;
 
   int num_groups_;
   int initial_segment_;
   int increment_;
   int time_slice_;
   int max_group_;
 
   // When max_views_ is 0, we don't cap the number of views.
   int max_views_;
 
   int group_;
   int views_;
   bool closed_;
 
   bool gplus_required_;
 
   bool new_notification_;
 
   DISALLOW_COPY_AND_ASSIGN(NotificationPromo);
 };
 
 #endif  // CHROME_BROWSER_WEB_RESOURCE_NOTIFICATION_PROMO_H_