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

Unified Diff: chrome/browser/extensions/api/copresence/copresence_api.cc

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/copresence/copresence_api.cc
diff --git a/chrome/browser/extensions/api/copresence/copresence_api.cc b/chrome/browser/extensions/api/copresence/copresence_api.cc
index edfd5095c1d703f3a1cb795cd7a9910740808d27..6875927d0aa0892a6942403bf9318a8cdf5e09dd 100644
--- a/chrome/browser/extensions/api/copresence/copresence_api.cc
+++ b/chrome/browser/extensions/api/copresence/copresence_api.cc
@@ -40,8 +40,12 @@ const char kInvalidOperationsMessage[] =
const char kShuttingDownMessage[] = "Shutting down.";
const std::string GetPrefName(bool authenticated) {
+#if defined(ENABLE_EXTENSIONS) && !defined(OS_ANDROID) && !defined(OS_IOS)
return authenticated ? prefs::kCopresenceAuthenticatedDeviceId
: prefs::kCopresenceAnonymousDeviceId;
+#else
+ return "dummy";
+#endif
}
} // namespace
@@ -96,18 +100,22 @@ void CopresenceService::set_manager_for_testing(
}
void CopresenceService::ResetState() {
+#if !defined(OS_ANDROID)
DVLOG(2) << "Deleting copresence state";
GetPrefService()->ClearPref(prefs::kCopresenceAuthenticatedDeviceId);
GetPrefService()->ClearPref(prefs::kCopresenceAnonymousDeviceId);
manager_ = nullptr;
+#endif
}
// static
void CopresenceService::RegisterProfilePrefs(PrefRegistrySyncable* registry) {
+#if !defined(OS_ANDROID)
registry->RegisterStringPref(prefs::kCopresenceAuthenticatedDeviceId,
std::string());
registry->RegisterStringPref(prefs::kCopresenceAnonymousDeviceId,
std::string());
+#endif
}
// static

Powered by Google App Engine
This is Rietveld 408576698