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

Unified Diff: chrome/browser/signin/signin_promo.cc

Issue 418043002: Add test for showing confirmation dialog for unsecure signin (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
Index: chrome/browser/signin/signin_promo.cc
diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc
index ec0a6a705c77662af156ccc68a2003fc05708131..435a3ea0e6ef9442836facd27dd8f5b1487bd602 100644
--- a/chrome/browser/signin/signin_promo.cc
+++ b/chrome/browser/signin/signin_promo.cc
@@ -10,6 +10,7 @@
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/extensions/signin/gaia_auth_extension_loader.h"
#include "chrome/browser/first_run/first_run.h"
#include "chrome/browser/google/google_brand.h"
#include "chrome/browser/profiles/profile.h"
@@ -163,8 +164,14 @@ void SetUserSkippedPromo(Profile* profile) {
}
GURL GetLandingURL(const char* option, int value) {
- const std::string& locale = g_browser_process->GetApplicationLocale();
- std::string url = base::StringPrintf(kSignInLandingUrlPrefix, locale.c_str());
+ std::string url;
+ if (switches::IsEnableWebBasedSignin()) {
+ const std::string& locale = g_browser_process->GetApplicationLocale();
+ url = base::StringPrintf(kSignInLandingUrlPrefix, locale.c_str());
+ } else {
+ url = base::StringPrintf(
+ "%s/success.html", extensions::kGaiaAuthExtensionOrigin);
+ }
base::StringAppendF(&url, "?%s=%d", option, value);
return GURL(url);
}

Powered by Google App Engine
This is Rietveld 408576698