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

Unified Diff: components/proximity_auth/webui/proximity_auth_webui_handler.h

Issue 1248533003: Hook up CryptAuthGCMManager to the enrollment and device sync managers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix webui Created 5 years, 5 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: components/proximity_auth/webui/proximity_auth_webui_handler.h
diff --git a/components/proximity_auth/webui/proximity_auth_webui_handler.h b/components/proximity_auth/webui/proximity_auth_webui_handler.h
index 860fecf4c902bc3fd43c176cefc1d1bc083f6e74..70e9894c50a4c2f3c22cbccfa065a2dcc93190c6 100644
--- a/components/proximity_auth/webui/proximity_auth_webui_handler.h
+++ b/components/proximity_auth/webui/proximity_auth_webui_handler.h
@@ -10,6 +10,7 @@
#include "components/proximity_auth/cryptauth/cryptauth_client.h"
#include "components/proximity_auth/cryptauth/cryptauth_device_manager.h"
#include "components/proximity_auth/cryptauth/cryptauth_enrollment_manager.h"
+#include "components/proximity_auth/cryptauth/cryptauth_gcm_manager.h"
#include "components/proximity_auth/logging/log_buffer.h"
#include "components/proximity_auth/webui/proximity_auth_ui_delegate.h"
#include "content/public/browser/web_ui_message_handler.h"
@@ -57,6 +58,7 @@ class ProximityAuthWebUIHandler : public content::WebUIMessageHandler,
void ForceDeviceSync(const base::ListValue* args);
// Initializes CryptAuth managers, used for development purposes.
+ void InitGCMManager();
void InitEnrollmentManager();
void InitDeviceManager();
@@ -84,6 +86,7 @@ class ProximityAuthWebUIHandler : public content::WebUIMessageHandler,
// TODO(tengs): These members are temporarily used for development.
scoped_ptr<PrefService> pref_service;
+ scoped_ptr<CryptAuthGCMManager> gcm_manager_;
scoped_ptr<CryptAuthEnrollmentManager> enrollment_manager_;
scoped_ptr<CryptAuthDeviceManager> device_manager_;

Powered by Google App Engine
This is Rietveld 408576698