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

Unified Diff: cloud_print/gcp20/prototype/printer.cc

Issue 22306002: GCP2.0 Device: New timeouts (5 sec). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changed error when getClaimToken is not ready Created 7 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 | « no previous file | cloud_print/gcp20/prototype/privet_http_server.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cloud_print/gcp20/prototype/printer.cc
diff --git a/cloud_print/gcp20/prototype/printer.cc b/cloud_print/gcp20/prototype/printer.cc
index 5a252c05645529dedf7f3aada60c5dd42b9fbeac..a161edde2acc129f7beb3e9eb826284e8884980e 100644
--- a/cloud_print/gcp20/prototype/printer.cc
+++ b/cloud_print/gcp20/prototype/printer.cc
@@ -240,9 +240,9 @@ PrivetHttpServer::RegistrationErrorStatus Printer::RegistrationGetClaimToken(
if (reg_info_.confirmation_state != RegistrationInfo::CONFIRMATION_CONFIRMED)
return ConfirmationToRegistrationError(reg_info_.confirmation_state);
- // If reply wasn't received yet, reply with |device_busy| error.
+ // If reply wasn't received yet, reply with |pending_user_action| error.
if (reg_info_.state == RegistrationInfo::DEV_REG_REGISTRATION_STARTED)
- return PrivetHttpServer::REG_ERROR_DEVICE_BUSY;
+ return PrivetHttpServer::REG_ERROR_PENDING_USER_ACTION;
DCHECK_EQ(reg_info_.state,
RegistrationInfo::DEV_REG_REGISTRATION_CLAIM_TOKEN_READY);
« no previous file with comments | « no previous file | cloud_print/gcp20/prototype/privet_http_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698