| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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_SERVICES_GCM_GCM_PROFILE_SERVICE_H_ | 5 #ifndef CHROME_BROWSER_SERVICES_GCM_GCM_PROFILE_SERVICE_H_ |
| 6 #define CHROME_BROWSER_SERVICES_GCM_GCM_PROFILE_SERVICE_H_ | 6 #define CHROME_BROWSER_SERVICES_GCM_GCM_PROFILE_SERVICE_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 scoped_ptr<GCMDriver> driver_; | 73 scoped_ptr<GCMDriver> driver_; |
| 74 | 74 |
| 75 // Implementation of content::PushMessagingService using GCMProfileService. | 75 // Implementation of content::PushMessagingService using GCMProfileService. |
| 76 PushMessagingServiceImpl push_messaging_service_; | 76 PushMessagingServiceImpl push_messaging_service_; |
| 77 | 77 |
| 78 // TODO(jianli): To be removed when sign-in enforcement is dropped. | 78 // TODO(jianli): To be removed when sign-in enforcement is dropped. |
| 79 #if !defined(OS_ANDROID) | 79 #if !defined(OS_ANDROID) |
| 80 class IdentityObserver; | 80 class IdentityObserver; |
| 81 scoped_ptr<IdentityObserver> identity_observer_; | 81 scoped_ptr<IdentityObserver> identity_observer_; |
| 82 #endif | 82 #endif |
| 83 #if defined(OS_CHROMEOS) | |
| 84 scoped_ptr<GCMConnectionObserver> chromeos_connection_observer_; | |
| 85 #endif | |
| 86 | 83 |
| 87 DISALLOW_COPY_AND_ASSIGN(GCMProfileService); | 84 DISALLOW_COPY_AND_ASSIGN(GCMProfileService); |
| 88 }; | 85 }; |
| 89 | 86 |
| 90 } // namespace gcm | 87 } // namespace gcm |
| 91 | 88 |
| 92 #endif // CHROME_BROWSER_SERVICES_GCM_GCM_PROFILE_SERVICE_H_ | 89 #endif // CHROME_BROWSER_SERVICES_GCM_GCM_PROFILE_SERVICE_H_ |
| OLD | NEW |