Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CHROME_BROWSER_WEB_RESOURCE_NOTIFICATION_PROMO_H_ | 5 #ifndef CHROME_BROWSER_WEB_RESOURCE_NOTIFICATION_PROMO_H_ |
| 6 #define CHROME_BROWSER_WEB_RESOURCE_NOTIFICATION_PROMO_H_ | 6 #define CHROME_BROWSER_WEB_RESOURCE_NOTIFICATION_PROMO_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 60 // Register preferences. | 60 // Register preferences. |
| 61 static void RegisterUserPrefs(PrefService* prefs); | 61 static void RegisterUserPrefs(PrefService* prefs); |
| 62 | 62 |
| 63 private: | 63 private: |
| 64 friend class base::RefCountedThreadSafe<NotificationPromo>; | 64 friend class base::RefCountedThreadSafe<NotificationPromo>; |
| 65 NotificationPromo(Profile* profile, Delegate* delegate); | 65 NotificationPromo(Profile* profile, Delegate* delegate); |
| 66 virtual ~NotificationPromo(); | 66 virtual ~NotificationPromo(); |
| 67 | 67 |
| 68 // For testing. | 68 // For testing. |
| 69 friend class NotificationPromoTestDelegate; | 69 friend class NotificationPromoTestDelegate; |
| 70 | |
| 71 #if !defined(OS_ANDROID) | |
|
Yaron
2012/04/09 17:12:55
Is this necessary given the test change (i.e. remo
Jerome
2012/04/09 18:24:06
Done.
| |
| 70 FRIEND_TEST_ALL_PREFIXES(PromoResourceServiceTest, GetNextQuestionValueTest); | 72 FRIEND_TEST_ALL_PREFIXES(PromoResourceServiceTest, GetNextQuestionValueTest); |
| 71 FRIEND_TEST_ALL_PREFIXES(PromoResourceServiceTest, NewGroupTest); | 73 FRIEND_TEST_ALL_PREFIXES(PromoResourceServiceTest, NewGroupTest); |
| 74 #endif | |
| 72 | 75 |
| 73 enum PlatformType { | 76 enum PlatformType { |
| 74 PLATFORM_NONE = 0, | 77 PLATFORM_NONE = 0, |
| 75 PLATFORM_WIN = 1, | 78 PLATFORM_WIN = 1, |
| 76 PLATFORM_MAC = 1 << 1, | 79 PLATFORM_MAC = 1 << 1, |
| 77 PLATFORM_LINUX = 1 << 2, | 80 PLATFORM_LINUX = 1 << 2, |
| 78 PLATFORM_CHROMEOS = 1 << 3, | 81 PLATFORM_CHROMEOS = 1 << 3, |
| 79 PLATFORM_ALL = (1 << 4) -1, | 82 PLATFORM_ALL = (1 << 4) -1, |
| 80 }; | 83 }; |
| 81 | 84 |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 158 int views_; | 161 int views_; |
| 159 std::string text_; | 162 std::string text_; |
| 160 bool closed_; | 163 bool closed_; |
| 161 bool gplus_; | 164 bool gplus_; |
| 162 | 165 |
| 163 DISALLOW_COPY_AND_ASSIGN(NotificationPromo); | 166 DISALLOW_COPY_AND_ASSIGN(NotificationPromo); |
| 164 }; | 167 }; |
| 165 | 168 |
| 166 #endif // CHROME_BROWSER_WEB_RESOURCE_NOTIFICATION_PROMO_H_ | 169 #endif // CHROME_BROWSER_WEB_RESOURCE_NOTIFICATION_PROMO_H_ |
| 167 | 170 |
| OLD | NEW |