chrome/browser/services/gcm/gcm_profile_service.h - Issue 597683005: GCM: D-Bus methods for wake-on-packet

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/services/gcm/gcm_profile_service.h

Issue 597683005: GCM: D-Bus methods for wake-on-packet (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Resolved DEPS conflict Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

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 68 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
79 scoped_ptr<GCMDriver> driver_;	79 scoped_ptr<GCMDriver> driver_;

80	80

81 // Implementation of content::PushMessagingService using GCMProfileService.	81 // Implementation of content::PushMessagingService using GCMProfileService.

82 PushMessagingServiceImpl push_messaging_service_;	82 PushMessagingServiceImpl push_messaging_service_;

83	83

84 // TODO(jianli): To be removed when sign-in enforcement is dropped.	84 // TODO(jianli): To be removed when sign-in enforcement is dropped.

85 #if !defined(OS_ANDROID)	85 #if !defined(OS_ANDROID)

86 class IdentityObserver;	86 class IdentityObserver;

87 scoped_ptr<IdentityObserver> identity_observer_;	87 scoped_ptr<IdentityObserver> identity_observer_;

88 #endif	88 #endif

	89 #if defined(OS_CHROMEOS)

	90 scoped_ptr<GCMConnectionObserver> chromeos_connection_observer_;

	91 #endif

89	92

90 DISALLOW_COPY_AND_ASSIGN(GCMProfileService);	93 DISALLOW_COPY_AND_ASSIGN(GCMProfileService);

91 };	94 };

92	95

93 } // namespace gcm	96 } // namespace gcm

94	97

95 #endif // CHROME_BROWSER_SERVICES_GCM_GCM_PROFILE_SERVICE_H_	98 #endif // CHROME_BROWSER_SERVICES_GCM_GCM_PROFILE_SERVICE_H_

OLD	NEW