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

Unified Diff: chrome/browser/extensions/api/gcd_private/gcd_private_api.cc

Issue 877613002: Added pairing with Spake SHA224 key exchange. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@brillo1
Patch Set: Thu Jan 29 23:44:10 PST 2015 Created 5 years, 11 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 | « no previous file | chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/gcd_private/gcd_private_api.cc
diff --git a/chrome/browser/extensions/api/gcd_private/gcd_private_api.cc b/chrome/browser/extensions/api/gcd_private/gcd_private_api.cc
index ca2ee50b08b116d136080bbadec9d743eb735efd..5c3f0a00ec375489a72c50ba934720d4250051db 100644
--- a/chrome/browser/extensions/api/gcd_private/gcd_private_api.cc
+++ b/chrome/browser/extensions/api/gcd_private/gcd_private_api.cc
@@ -358,9 +358,8 @@ void GcdPrivateAPIImpl::SendMessage(int session_id,
std::string ssid;
if (!wifi->GetString(kPrivetKeySSID, &ssid)) {
- callback.Run(gcd_private::STATUS_SETUPPARSEERROR,
- base::DictionaryValue());
- return;
+ return callback.Run(gcd_private::STATUS_SETUPPARSEERROR,
+ base::DictionaryValue());
}
if (!wifi->HasKey(kPrivetKeyPassphrase)) {
@@ -369,9 +368,8 @@ void GcdPrivateAPIImpl::SendMessage(int session_id,
PasswordMap::iterator found = wifi_passwords_.find(ssid);
if (found == wifi_passwords_.end()) {
- callback.Run(gcd_private::STATUS_WIFIPASSWORDERROR,
- base::DictionaryValue());
- return;
+ return callback.Run(gcd_private::STATUS_WIFIPASSWORDERROR,
+ base::DictionaryValue());
}
input_cloned.reset(input.DeepCopy());
@@ -384,9 +382,8 @@ void GcdPrivateAPIImpl::SendMessage(int session_id,
auto found = sessions_.find(session_id);
if (found == sessions_.end()) {
- callback.Run(gcd_private::STATUS_UNKNOWNSESSIONERROR,
- base::DictionaryValue());
- return;
+ return callback.Run(gcd_private::STATUS_UNKNOWNSESSIONERROR,
+ base::DictionaryValue());
}
found->second->SendMessage(api, *input_actual, callback);
« no previous file with comments | « no previous file | chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698