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

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

Issue 469883002: Using API key specified from js (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing API build Created 6 years, 4 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
« no previous file with comments | « chrome/browser/extensions/api/copresence/copresence_api.h ('k') | components/copresence/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f4acd8b55a2082db2a066df0ed70e4a9060cc7eb..c5a3f5177dc16ff2c60ebac8ae292c2aa250ca1b 100644
--- a/chrome/browser/extensions/api/copresence/copresence_api.cc
+++ b/chrome/browser/extensions/api/copresence/copresence_api.cc
@@ -33,11 +33,9 @@ const char kShuttingDownMessage[] = "Shutting down.";
// CopresenceService implementation:
CopresenceService::CopresenceService(content::BrowserContext* context)
- : is_shutting_down_(false), browser_context_(context) {
-}
+ : is_shutting_down_(false), browser_context_(context) {}
-CopresenceService::~CopresenceService() {
-}
+CopresenceService::~CopresenceService() {}
copresence::CopresenceClient* CopresenceService::client() {
if (!client_ && !is_shutting_down_)
@@ -109,6 +107,10 @@ const std::string CopresenceService::GetPlatformVersionString() const {
return chrome::VersionInfo().CreateVersionString();
}
+const std::string CopresenceService::GetAPIKey() const {
+ return api_key_;
+}
+
copresence::WhispernetClient* CopresenceService::GetWhispernetClient() {
return whispernet_client();
}
@@ -163,8 +165,9 @@ ExtensionFunction::ResponseAction CopresenceSetApiKeyFunction::Run() {
api::copresence::SetApiKey::Params::Create(*args_));
EXTENSION_FUNCTION_VALIDATE(params.get());
- // TODO(rkc): Use the API key set by this function for this app.
- // http://crbug.com/400617.
+ // The api key may be set to empty, to clear it.
+ CopresenceService::GetFactoryInstance()->Get(browser_context())
+ ->set_api_key(params->api_key);
return RespondNow(NoArguments());
}
« no previous file with comments | « chrome/browser/extensions/api/copresence/copresence_api.h ('k') | components/copresence/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698