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

Unified Diff: chrome/browser/ui/webui/signin/inline_login_handler.cc

Issue 256623002: Implemented inline login dialog for Chrome OS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge conflicts resolved. Created 6 years, 7 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/signin/inline_login_handler.cc
diff --git a/chrome/browser/ui/webui/signin/inline_login_handler.cc b/chrome/browser/ui/webui/signin/inline_login_handler.cc
index 6c6e9110734ab67b83de49c47ce2690d505587c6..dbe26a0f9b0ac96b7955bc12895254908cf60efd 100644
--- a/chrome/browser/ui/webui/signin/inline_login_handler.cc
+++ b/chrome/browser/ui/webui/signin/inline_login_handler.cc
@@ -5,10 +5,18 @@
#include "chrome/browser/ui/webui/signin/inline_login_handler.h"
#include "base/bind.h"
+#include "base/prefs/pref_service.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/signin/signin_promo.h"
+#include "chrome/browser/ui/browser_navigator.h"
+#include "chrome/common/pref_names.h"
+#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui.h"
#include "google_apis/gaia/gaia_urls.h"
+#include "net/base/url_util.h"
InlineLoginHandler::InlineLoginHandler() {}
@@ -21,6 +29,10 @@ void InlineLoginHandler::RegisterMessages() {
web_ui()->RegisterMessageCallback("completeLogin",
base::Bind(&InlineLoginHandler::HandleCompleteLoginMessage,
base::Unretained(this)));
+ web_ui()->RegisterMessageCallback(
+ "switchToFullTab",
+ base::Bind(&InlineLoginHandler::HandleSwitchToFullTabMessage,
+ base::Unretained(this)));
}
void InlineLoginHandler::HandleInitializeMessage(const base::ListValue* args) {
@@ -30,7 +42,48 @@ void InlineLoginHandler::HandleInitializeMessage(const base::ListValue* args) {
params.SetString("hl", app_locale);
GaiaUrls* gaiaUrls = GaiaUrls::GetInstance();
params.SetString("gaiaUrl", gaiaUrls->gaia_url().spec());
- params.SetInteger("authMode", kDefaultAuthMode);
+ params.SetInteger("authMode", InlineLoginHandler::kDesktopAuthMode);
+
+ const GURL& current_url = web_ui()->GetWebContents()->GetURL();
+ signin::Source source = signin::GetSourceForPromoURL(current_url);
+ if (source == signin::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT ||
+ source == signin::SOURCE_AVATAR_BUBBLE_SIGN_IN) {
+ // Drop the leading slash in the path.
+ params.SetString(
+ "gaiaPath",
+ GaiaUrls::GetInstance()->embedded_signin_url().path().substr(1));
+ }
+
+ params.SetString(
+ "continueUrl",
+ signin::GetLandingURL("source", static_cast<int>(source)).spec());
+
+ std::string default_email;
+ if (source != signin::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT) {
+ default_email = Profile::FromWebUI(web_ui())->GetPrefs()->GetString(
+ prefs::kGoogleServicesLastUsername);
+ } else {
+ if (!net::GetValueForKeyInQuery(current_url, "email", &default_email))
+ default_email.clear();
+ }
+ if (!default_email.empty())
+ params.SetString("email", default_email);
+
+ std::string frame_url;
+ net::GetValueForKeyInQuery(current_url, "frameUrl", &frame_url);
+ if (!frame_url.empty())
+ params.SetString("frameUrl", frame_url);
+
+ std::string is_constrained;
+ net::GetValueForKeyInQuery(current_url, "constrained", &is_constrained);
+ if (!is_constrained.empty())
+ params.SetString("constrained", is_constrained);
+
+ // TODO(rogerta): this needs to be passed on to gaia somehow.
+ std::string read_only_email;
+ net::GetValueForKeyInQuery(current_url, "readOnlyEmail", &read_only_email);
+ if (!read_only_email.empty())
+ params.SetString("readOnlyEmail", read_only_email);
SetExtraInitParams(params);
@@ -41,3 +94,21 @@ void InlineLoginHandler::HandleCompleteLoginMessage(
const base::ListValue* args) {
CompleteLogin(args);
}
+
+void InlineLoginHandler::HandleSwitchToFullTabMessage(
+ const base::ListValue* args) {
+ base::string16 url_str;
+ CHECK(args->GetString(0, &url_str));
+
+ content::WebContents* web_contents = web_ui()->GetWebContents();
+ GURL main_frame_url(web_contents->GetURL());
+ main_frame_url = net::AppendOrReplaceQueryParameter(
+ main_frame_url, "frameUrl", base::UTF16ToASCII(url_str));
+ chrome::NavigateParams params(
+ Profile::FromWebUI(web_ui()),
+ net::AppendOrReplaceQueryParameter(main_frame_url, "constrained", "0"),
+ content::PAGE_TRANSITION_AUTO_TOPLEVEL);
+ chrome::Navigate(&params);
+
+ web_ui()->CallJavascriptFunction("inline.login.closeDialog");
+}
« no previous file with comments | « chrome/browser/ui/webui/signin/inline_login_handler.h ('k') | chrome/browser/ui/webui/signin/inline_login_handler_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698