Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2416)

Unified Diff: chrome/browser/invalidation/p2p_invalidation_service.cc

Issue 179843002: Make invalidations work for Chrome OS Kiosk Apps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge error leading to uninitialized memory access. Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/invalidation/p2p_invalidation_service.cc
diff --git a/chrome/browser/invalidation/p2p_invalidation_service.cc b/chrome/browser/invalidation/p2p_invalidation_service.cc
index 7f6dcf16d331abc9b5519abd1ed94127a0edc3af..4ee9f919d253aad5eaeee8905899fcbaa062c19c 100644
--- a/chrome/browser/invalidation/p2p_invalidation_service.cc
+++ b/chrome/browser/invalidation/p2p_invalidation_service.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/invalidation/p2p_invalidation_service.h"
#include "base/command_line.h"
+#include "chrome/browser/invalidation/invalidation_auth_provider.h"
#include "chrome/browser/invalidation/invalidation_service_util.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/chrome_switches.h"
@@ -18,7 +19,10 @@ class URLRequestContextGetter;
namespace invalidation {
-P2PInvalidationService::P2PInvalidationService(Profile* profile) {
+P2PInvalidationService::P2PInvalidationService(
+ Profile* profile,
+ scoped_ptr<InvalidationAuthProvider> auth_provider)
+ : auth_provider_(auth_provider.Pass()) {
notifier::NotifierOptions notifier_options =
ParseNotifierOptions(*CommandLine::ForCurrentProcess());
notifier_options.request_context_getter = profile->GetRequestContext();
@@ -80,4 +84,9 @@ void P2PInvalidationService::RequestDetailedStatus(
caller.Run(value);
}
+InvalidationAuthProvider*
+P2PInvalidationService::GetInvalidationAuthProvider() {
+ return auth_provider_.get();
+}
+
} // namespace invalidation

Powered by Google App Engine
This is Rietveld 408576698