Only show G+ promo for users logged into G+

chrome/browser/web_resource/notification_promo.h

Index: chrome/browser/web_resource/notification_promo.h
===================================================================
--- chrome/browser/web_resource/notification_promo.h	(revision 108876)
+++ chrome/browser/web_resource/notification_promo.h	(working copy)
@@ -10,16 +10,22 @@
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
+#include "net/url_request/url_request_context.h"

[achuithb, 2011/11/16 23:27:03]

Shouldn't this be in the cc file? You're forward declaring
net::URLRequestContextGetter

[Cait (Slow), 2011/11/17 00:05:59]

Done.

 
 namespace base {
   class DictionaryValue;
 }
 
+namespace net {
+  class URLRequestContextGetter;
+}
+
 class PrefService;
-
+class Profile;
 // Helper class for PromoResourceService that parses promo notification info

[achuithb, 2011/11/16 23:27:03]

newline above this line please.

[Cait (Slow), 2011/11/17 00:05:59]

Done.

 // from json or prefs.
-class NotificationPromo {
+class NotificationPromo
+  : public base::RefCountedThreadSafe<NotificationPromo> {
  public:
   class Delegate {
    public:
@@ -29,8 +35,10 @@
      virtual bool IsBuildAllowed(int builds_targeted) const { return false; }
   };
 
-  explicit NotificationPromo(PrefService* prefs, Delegate* delegate);
+  // Static factory for creating new promo objects.

[achuithb, 2011/11/16 23:27:03]

Perhaps change this to 'Static factory for creating new notification promos'. We
have a number of different promo objects.

[Cait (Slow), 2011/11/17 00:05:59]

Done.

+  static NotificationPromo* Factory(Profile* profile, Delegate* delegate);
 
+
   // Initialize from json/prefs.
   void InitFromJson(const base::DictionaryValue& json);
   void InitFromPrefs();
@@ -49,7 +57,14 @@
   // Register preferences.
   static void RegisterUserPrefs(PrefService* prefs);
 
+ protected:

[achuithb, 2011/11/16 23:27:03]

Remove these lines

[Cait (Slow), 2011/11/17 00:05:59]

Done.

+
+
  private:
+  friend class base::RefCountedThreadSafe<NotificationPromo>;
+  NotificationPromo(Profile* profile, Delegate* delegate);
+  virtual ~NotificationPromo();
+
   // For testing.
   friend class NotificationPromoTestDelegate;
   FRIEND_TEST_ALL_PREFIXES(PromoResourceServiceTest, GetNextQuestionValueTest);
@@ -70,11 +85,15 @@
 
   // Check if this promo notification is new based on start/end times,
   // and trigger events accordingly.
-  void CheckForNewNotification();
+  void CheckForNewNotification(bool found_cookie);
 
   // Actions on receiving a new promo notification.
   void OnNewNotification();
 
+  void GetCookiesCallback(const std::string& cookies);

[achuithb, 2011/11/16 23:27:03]

Switch the order of GetCookies and GetCookiesCallback and add comments please.

[Cait (Slow), 2011/11/17 00:05:59]

Done.

+
+  void GetCookies(net::URLRequestContextGetter* getter);
+
   // Create a new promo notification group.
   static int NewGroup();
 
@@ -94,6 +113,7 @@
   // For testing.
   bool operator==(const NotificationPromo& other) const;
 
+  Profile* profile_;
   PrefService* prefs_;
   Delegate* delegate_;
 
@@ -104,11 +124,13 @@
   int time_slice_;
   int max_group_;
   int max_views_;
+  int feature_mask_;
 
   int group_;
   int views_;
   std::string text_;
   bool closed_;
+  bool gplus_;
 
   DISALLOW_COPY_AND_ASSIGN(NotificationPromo);
 };