Skip to content

GitLab

T
tangled
Commit 74129b89 authored by Kush Sinha's avatar Kush Sinha Committed by Commit Bot
Browse files
Options

Fix crOS Account Manager welcome screen to spec 

Screenshot: https://crbug.com/933482#c3

Bug: 933482
Change-Id: I0a260745503bb46be895896c95492a9c35815d95
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1556794
Commit-Queue: Kush Sinha <sinhak@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#649070}
parent 4e41dd51
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 28 deletions
chrome/app/chromeos_strings.grdp
View file @ 74129b89
......@@ -3865,11 +3865,8 @@
Manage your Google Accounts in one place
</message>
<message name="IDS_ACCOUNT_MANAGER_WELCOME_TEXT" desc="Text body for the Chrome OS Account Manager Welcome screen.">
Apps and websites that have your permission can access the account information they need to work properly.
If you don't want to add an account, sign in as a guest or open an incognito window for web browsing.
You can go to Settings -> Google Accounts to view and manage all accounts.
Switch accounts quickly and sign in to apps and websites all at once.
Apps and sites can ask you for permission to use some of your Google Account info. <ph name="LINK_BEGIN">&lt;a target="_blank" href="$1<ex>https://support.google.com/chromebook/?p=google_accounts</ex>"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
</message>
<!-- TPM firmware auto-update notifications -->
......
chrome/app/chromeos_strings_grdp/IDS_ACCOUNT_MANAGER_WELCOME_TEXT.png.sha1
View file @ 74129b89
43b13f274f906c3b0e2aca792cc286b883b73c05
\ No newline at end of file
19ffbc3968fe63257627287ffa342e424c7c1cfc
\ No newline at end of file
chrome/browser/resources/chromeos/account_manager_welcome.css
View file @ 74129b89
......@@ -3,20 +3,38 @@
* found in the LICENSE file. */
body {
padding-inline-end: 4em;
padding-inline-start: 4em;
height: 585px;
margin-bottom: 32px;
margin-inline-end: 32px;
margin-inline-start: 32px;
margin-top: 20px;
}
h1 {
font-family: 'Google Sans', Helvetica, Roboto, sans-serif;
font-weight: normal;
margin-bottom: 16px;
margin-top: 28px;
}
p {
font-family: 'Google Sans', Helvetica, Roboto, sans-serif;
font-family: Roboto, sans-serif;
line-height: 1.5;
white-space: pre-line;
}
a {
color: var(--cr-link-color);
text-decoration: none;
}
#content {
height: 100%;
padding-inline-end: 32px;
padding-inline-start: 32px;
position: relative;
}
#google-logo {
height: 30px;
width: 30px;
......@@ -26,10 +44,7 @@ p {
display: block;
margin-inline-end: auto;
margin-inline-start: auto;
}
#ok-button-container {
position: relative;
margin-top: 60px;
}
#ok-button {
......
chrome/browser/resources/chromeos/account_manager_welcome.html
View file @ 74129b89
<!doctype html>
<html i18n-values="dir:textdirection;lang:language">
<html dir="$i18n{textdirection}" lang="$i18n{language}">
<head>
<meta charset="utf-8">
<link rel="import" href="chrome://resources/html/polymer.html">
......@@ -16,16 +16,15 @@
<script src="strings.js"></script>
<script src="account_manager_welcome.js"></script>
</head>
<body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
<img id="google-logo" src="googleg.svg">
<h1 i18n-content="welcomeTitle"></h1>
<p i18n-content="welcomeMessage"></p>
<img id="welcome-image"
srcset="account_manager_welcome_1x.png 1x,
account_manager_welcome_2x.png 2x">
<div id="ok-button-container">
<paper-button raised id="ok-button" i18n-content="okButton"></paper-button>
<body>
<div id="content">
<img id="google-logo" src="googleg.svg">
<h1>$i18n{welcomeTitle}</h1>
<p>$i18nRaw{welcomeMessage}</p>
<img id="welcome-image"
srcset="account_manager_welcome_1x.png 1x,
account_manager_welcome_2x.png 2x">
<paper-button raised id="ok-button">$i18n{okButton}</paper-button>
</div>
<script src="chrome://resources/js/i18n_template.js"></script>
......
chrome/browser/ui/webui/chromeos/account_manager_welcome_dialog.cc
View file @ 74129b89
......@@ -21,8 +21,8 @@ namespace chromeos {
namespace {
AccountManagerWelcomeDialog* g_dialog = nullptr;
constexpr int kSigninDialogWidth = 600;
constexpr int kSigninDialogHeight = 500;
constexpr int kSigninDialogWidth = 768;
constexpr int kSigninDialogHeight = 640;
constexpr int kMaxNumTimesShown = 1;
} // namespace
......
chrome/browser/ui/webui/chromeos/account_manager_welcome_ui.cc
View file @ 74129b89
......@@ -5,15 +5,24 @@
#include "chrome/browser/ui/webui/chromeos/account_manager_welcome_ui.h"
#include "base/bind.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/webui_url_constants.h"
#include "chrome/grit/browser_resources.h"
#include "chrome/grit/generated_resources.h"
#include "content/public/browser/web_ui_data_source.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/strings/grit/ui_strings.h"
namespace chromeos {
namespace {
constexpr char kAccountManagerLearnMoreURL[] =
"https://support.google.com/chromebook/?p=google_accounts";
} // namespace
AccountManagerWelcomeUI::AccountManagerWelcomeUI(content::WebUI* web_ui)
: ui::WebDialogUI(web_ui), weak_factory_(this) {
content::WebUIDataSource* html_source = content::WebUIDataSource::Create(
......@@ -28,8 +37,10 @@ AccountManagerWelcomeUI::AccountManagerWelcomeUI(content::WebUI* web_ui)
// Add localized strings.
html_source->AddLocalizedString("welcomeTitle",
IDS_ACCOUNT_MANAGER_WELCOME_TITLE);
html_source->AddLocalizedString("welcomeMessage",
IDS_ACCOUNT_MANAGER_WELCOME_TEXT);
html_source->AddString("welcomeMessage",
l10n_util::GetStringFUTF16(
IDS_ACCOUNT_MANAGER_WELCOME_TEXT,
base::ASCIIToUTF16(kAccountManagerLearnMoreURL)));
html_source->AddLocalizedString("okButton", IDS_APP_OK);
// Add required resources.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment