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

Side by Side Diff: chrome/browser/ui/webui/signin/inline_login_handler.cc

Issue 1344443002: Implement new password separated sign in flow for chrome desktop. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merged Created 5 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/signin/inline_login_handler.h" 5 #include "chrome/browser/ui/webui/signin/inline_login_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 base::DictionaryValue params; 42 base::DictionaryValue params;
43 43
44 const std::string& app_locale = g_browser_process->GetApplicationLocale(); 44 const std::string& app_locale = g_browser_process->GetApplicationLocale();
45 params.SetString("hl", app_locale); 45 params.SetString("hl", app_locale);
46 GaiaUrls* gaiaUrls = GaiaUrls::GetInstance(); 46 GaiaUrls* gaiaUrls = GaiaUrls::GetInstance();
47 params.SetString("gaiaUrl", gaiaUrls->gaia_url().spec()); 47 params.SetString("gaiaUrl", gaiaUrls->gaia_url().spec());
48 params.SetInteger("authMode", InlineLoginHandler::kDesktopAuthMode); 48 params.SetInteger("authMode", InlineLoginHandler::kDesktopAuthMode);
49 49
50 const GURL& current_url = web_ui()->GetWebContents()->GetURL(); 50 const GURL& current_url = web_ui()->GetWebContents()->GetURL();
51 signin_metrics::Source source = signin::GetSourceForPromoURL(current_url); 51 signin_metrics::Source source = signin::GetSourceForPromoURL(current_url);
52 if (source == signin_metrics::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT ||
53 source == signin_metrics::SOURCE_AVATAR_BUBBLE_SIGN_IN ||
54 source == signin_metrics::SOURCE_REAUTH) {
55 // Drop the leading slash in the path.
56 params.SetString(
57 "gaiaPath",
58 GaiaUrls::GetInstance()->embedded_signin_url().path().substr(1));
59 }
60 52
61 params.SetString( 53 params.SetString(
62 "continueUrl", 54 "continueUrl",
63 signin::GetLandingURL(signin::kSignInPromoQueryKeySource, 55 signin::GetLandingURL(signin::kSignInPromoQueryKeySource,
64 static_cast<int>(source)).spec()); 56 static_cast<int>(source)).spec());
65 57
66 Profile* profile = Profile::FromWebUI(web_ui()); 58 Profile* profile = Profile::FromWebUI(web_ui());
67 std::string default_email; 59 std::string default_email;
68 if (source != signin_metrics::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT && 60 if (source != signin_metrics::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT &&
69 source != signin_metrics::SOURCE_REAUTH) { 61 source != signin_metrics::SOURCE_REAUTH) {
(...skipping 19 matching lines...) Expand all
89 81
90 std::string is_constrained; 82 std::string is_constrained;
91 net::GetValueForKeyInQuery( 83 net::GetValueForKeyInQuery(
92 current_url, signin::kSignInPromoQueryKeyConstrained, &is_constrained); 84 current_url, signin::kSignInPromoQueryKeyConstrained, &is_constrained);
93 if (!is_constrained.empty()) 85 if (!is_constrained.empty())
94 params.SetString(signin::kSignInPromoQueryKeyConstrained, is_constrained); 86 params.SetString(signin::kSignInPromoQueryKeyConstrained, is_constrained);
95 87
96 // TODO(rogerta): this needs to be passed on to gaia somehow. 88 // TODO(rogerta): this needs to be passed on to gaia somehow.
97 std::string read_only_email; 89 std::string read_only_email;
98 net::GetValueForKeyInQuery(current_url, "readOnlyEmail", &read_only_email); 90 net::GetValueForKeyInQuery(current_url, "readOnlyEmail", &read_only_email);
99 if (!read_only_email.empty()) 91 params.SetBoolean("readOnlyEmail", !read_only_email.empty());
100 params.SetString("readOnlyEmail", read_only_email);
101 92
102 SetExtraInitParams(params); 93 SetExtraInitParams(params);
103 94
104 web_ui()->CallJavascriptFunction("inline.login.loadAuthExtension", params); 95 web_ui()->CallJavascriptFunction("inline.login.loadAuthExtension", params);
105 } 96 }
106 97
107 void InlineLoginHandler::HandleCompleteLoginMessage( 98 void InlineLoginHandler::HandleCompleteLoginMessage(
108 const base::ListValue* args) { 99 const base::ListValue* args) {
109 CompleteLogin(args); 100 CompleteLogin(args);
110 } 101 }
(...skipping 21 matching lines...) Expand all
132 123
133 chrome::NavigateParams params( 124 chrome::NavigateParams params(
134 profile, 125 profile,
135 net::AppendOrReplaceQueryParameter( 126 net::AppendOrReplaceQueryParameter(
136 main_frame_url, signin::kSignInPromoQueryKeyConstrained, "0"), 127 main_frame_url, signin::kSignInPromoQueryKeyConstrained, "0"),
137 ui::PAGE_TRANSITION_AUTO_TOPLEVEL); 128 ui::PAGE_TRANSITION_AUTO_TOPLEVEL);
138 chrome::Navigate(&params); 129 chrome::Navigate(&params);
139 130
140 web_ui()->CallJavascriptFunction("inline.login.closeDialog"); 131 web_ui()->CallJavascriptFunction("inline.login.closeDialog");
141 } 132 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698