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

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: Address review comments Created 5 years, 3 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 30 matching lines...) Expand all
41 base::DictionaryValue params; 41 base::DictionaryValue params;
42 42
43 const std::string& app_locale = g_browser_process->GetApplicationLocale(); 43 const std::string& app_locale = g_browser_process->GetApplicationLocale();
44 params.SetString("hl", app_locale); 44 params.SetString("hl", app_locale);
45 GaiaUrls* gaiaUrls = GaiaUrls::GetInstance(); 45 GaiaUrls* gaiaUrls = GaiaUrls::GetInstance();
46 params.SetString("gaiaUrl", gaiaUrls->gaia_url().spec()); 46 params.SetString("gaiaUrl", gaiaUrls->gaia_url().spec());
47 params.SetInteger("authMode", InlineLoginHandler::kDesktopAuthMode); 47 params.SetInteger("authMode", InlineLoginHandler::kDesktopAuthMode);
48 48
49 const GURL& current_url = web_ui()->GetWebContents()->GetURL(); 49 const GURL& current_url = web_ui()->GetWebContents()->GetURL();
50 signin_metrics::Source source = signin::GetSourceForPromoURL(current_url); 50 signin_metrics::Source source = signin::GetSourceForPromoURL(current_url);
51 if (source == signin_metrics::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT ||
52 source == signin_metrics::SOURCE_AVATAR_BUBBLE_SIGN_IN ||
53 source == signin_metrics::SOURCE_REAUTH) {
54 // Drop the leading slash in the path.
55 params.SetString(
56 "gaiaPath",
57 GaiaUrls::GetInstance()->embedded_signin_url().path().substr(1));
58 }
59 51
60 params.SetString( 52 params.SetString(
61 "continueUrl", 53 "continueUrl",
62 signin::GetLandingURL(signin::kSignInPromoQueryKeySource, 54 signin::GetLandingURL(signin::kSignInPromoQueryKeySource,
63 static_cast<int>(source)).spec()); 55 static_cast<int>(source)).spec());
64 56
65 Profile* profile = Profile::FromWebUI(web_ui()); 57 Profile* profile = Profile::FromWebUI(web_ui());
66 std::string default_email; 58 std::string default_email;
67 if (source != signin_metrics::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT && 59 if (source != signin_metrics::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT &&
68 source != signin_metrics::SOURCE_REAUTH) { 60 source != signin_metrics::SOURCE_REAUTH) {
(...skipping 19 matching lines...) Expand all
88 80
89 std::string is_constrained; 81 std::string is_constrained;
90 net::GetValueForKeyInQuery( 82 net::GetValueForKeyInQuery(
91 current_url, signin::kSignInPromoQueryKeyConstrained, &is_constrained); 83 current_url, signin::kSignInPromoQueryKeyConstrained, &is_constrained);
92 if (!is_constrained.empty()) 84 if (!is_constrained.empty())
93 params.SetString(signin::kSignInPromoQueryKeyConstrained, is_constrained); 85 params.SetString(signin::kSignInPromoQueryKeyConstrained, is_constrained);
94 86
95 // TODO(rogerta): this needs to be passed on to gaia somehow. 87 // TODO(rogerta): this needs to be passed on to gaia somehow.
96 std::string read_only_email; 88 std::string read_only_email;
97 net::GetValueForKeyInQuery(current_url, "readOnlyEmail", &read_only_email); 89 net::GetValueForKeyInQuery(current_url, "readOnlyEmail", &read_only_email);
98 if (!read_only_email.empty()) 90 params.SetBoolean("readOnlyEmail", !read_only_email.empty());
99 params.SetString("readOnlyEmail", read_only_email);
100 91
101 SetExtraInitParams(params); 92 SetExtraInitParams(params);
102 93
103 web_ui()->CallJavascriptFunction("inline.login.loadAuthExtension", params); 94 web_ui()->CallJavascriptFunction("inline.login.loadAuthExtension", params);
104 } 95 }
105 96
106 void InlineLoginHandler::HandleCompleteLoginMessage( 97 void InlineLoginHandler::HandleCompleteLoginMessage(
107 const base::ListValue* args) { 98 const base::ListValue* args) {
108 CompleteLogin(args); 99 CompleteLogin(args);
109 } 100 }
(...skipping 21 matching lines...) Expand all
131 122
132 chrome::NavigateParams params( 123 chrome::NavigateParams params(
133 profile, 124 profile,
134 net::AppendOrReplaceQueryParameter( 125 net::AppendOrReplaceQueryParameter(
135 main_frame_url, signin::kSignInPromoQueryKeyConstrained, "0"), 126 main_frame_url, signin::kSignInPromoQueryKeyConstrained, "0"),
136 ui::PAGE_TRANSITION_AUTO_TOPLEVEL); 127 ui::PAGE_TRANSITION_AUTO_TOPLEVEL);
137 chrome::Navigate(&params); 128 chrome::Navigate(&params);
138 129
139 web_ui()->CallJavascriptFunction("inline.login.closeDialog"); 130 web_ui()->CallJavascriptFunction("inline.login.closeDialog");
140 } 131 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698