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

Unified Diff: chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc

Issue 14208014: Simplify adding callbacks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix, sync. Created 7 years, 8 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/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc
index ddf2e0b5d72b76fffee900f70ccff39d0d4b2e3c..94f21be951a0430472e4f679d1ecc4fabc4946a5 100644
--- a/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc
@@ -7,6 +7,7 @@
#include <algorithm>
#include "base/command_line.h"
+#include "base/values.h"
#include "chrome/browser/browsing_data/browsing_data_helper.h"
#include "chrome/browser/browsing_data/browsing_data_remover.h"
#include "chrome/browser/net/gaia/gaia_oauth_fetcher.h"
@@ -377,11 +378,7 @@ void EnterpriseOAuthEnrollmentScreenHandler::OnBrowsingDataRemoverDone() {
// EnterpriseOAuthEnrollmentScreenHandler, private -----------------------------
void EnterpriseOAuthEnrollmentScreenHandler::HandleClose(
- const base::ListValue* value) {
- std::string reason;
- CHECK_EQ(1U, value->GetSize());
- CHECK(value->GetString(0, &reason));
-
+ const std::string& reason) {
if (!controller_) {
NOTREACHED();
return;
@@ -398,28 +395,19 @@ void EnterpriseOAuthEnrollmentScreenHandler::HandleClose(
}
void EnterpriseOAuthEnrollmentScreenHandler::HandleCompleteLogin(
- const base::ListValue* value) {
+ const std::string& user) {
if (!controller_) {
NOTREACHED();
return;
}
-
- std::string user;
- if (!value->GetString(0, &user)) {
- NOTREACHED() << "Invalid user parameter from UI.";
- return;
- }
-
controller_->OnLoginDone(gaia::SanitizeEmail(user));
}
-void EnterpriseOAuthEnrollmentScreenHandler::HandleRetry(
- const base::ListValue* value) {
+void EnterpriseOAuthEnrollmentScreenHandler::HandleRetry() {
if (!controller_) {
NOTREACHED();
return;
}
-
controller_->OnRetry();
}

Powered by Google App Engine
This is Rietveld 408576698