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

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

Issue 646983008: Implement signin using webview (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed nits and updated histogram Created 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/signin/inline_login_ui.cc
diff --git a/chrome/browser/ui/webui/signin/inline_login_ui.cc b/chrome/browser/ui/webui/signin/inline_login_ui.cc
index cf3ec666e6f4ce11c80e020def286f4ba2c6964a..9fd5b1e1c615cebb729551af71aee0a8228e180e 100644
--- a/chrome/browser/ui/webui/signin/inline_login_ui.cc
+++ b/chrome/browser/ui/webui/signin/inline_login_ui.cc
@@ -9,6 +9,7 @@
#include "chrome/browser/sessions/session_tab_helper.h"
#include "chrome/common/url_constants.h"
#include "chrome/grit/chromium_strings.h"
+#include "components/signin/core/common/profile_management_switches.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/web_ui.h"
#include "content/public/browser/web_ui_data_source.h"
@@ -28,9 +29,13 @@ content::WebUIDataSource* CreateWebUIDataSource() {
source->OverrideContentSecurityPolicyObjectSrc("object-src *;");
source->SetJsonPath("strings.js");
- source->SetDefaultResource(IDR_INLINE_LOGIN_HTML);
+ bool is_webview_signin_enabled = switches::IsEnableWebviewBasedSignin();
+ source->SetDefaultResource(is_webview_signin_enabled ?
+ IDR_NEW_INLINE_LOGIN_HTML : IDR_INLINE_LOGIN_HTML);
source->AddResourcePath("inline_login.css", IDR_INLINE_LOGIN_CSS);
source->AddResourcePath("inline_login.js", IDR_INLINE_LOGIN_JS);
+ source->AddResourcePath("gaia_auth_host.js", is_webview_signin_enabled ?
+ IDR_GAIA_AUTH_AUTHENTICATOR_JS : IDR_GAIA_AUTH_HOST_JS);
source->AddLocalizedString("title", IDS_CHROME_SIGNIN_TITLE);
return source;
« no previous file with comments | « chrome/browser/ui/webui/signin/inline_login_handler_impl.cc ('k') | components/signin/core/browser/about_signin_internals.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698