Skip to content

GitLab

T
tangled
Commit 6302b21f authored by Hector Carmona's avatar Hector Carmona Committed by Commit Bot
Browse files
Options

Navi: Remove old welcome page. 

This is dead code and should not be accessible by our users.

Bug: 956680
Change-Id: I2da85dbada54ea683417b8309dff46f08d1dcca4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1713443Reviewed-by: default avatarEsmael Elmoslimany <aee@chromium.org>
Commit-Queue: Hector Carmona <hcarmona@chromium.org>
Cr-Commit-Position: refs/heads/master@{#680041}
parent 8cfeb0df
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 466 deletions
chrome/app/chromium_strings.grd
View file @ 6302b21f
......@@ -1169,9 +1169,6 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@example.com</
<message name="IDS_WELCOME_HEADER" desc="A message which will appear as the header on the Welcome UI if the user has never run Chromium before.">
Welcome to Chromium
</message>
<message name="IDS_WELCOME_HEADER_AFTER_FIRST_RUN" desc="A message which will appear as the header on the Welcome UI if the user has run Chromium before.">
Take Chromium everywhere
</message>
</if>
<!-- Native notifications for Windows 10 -->
......
chrome/app/generated_resources.grd
View file @ 6302b21f
......@@ -9330,22 +9330,6 @@ Please help our engineers fix this problem. Tell us what happened right before y
</message>
</if>
<!-- Welcome page (chrome://welcome) strings -->
<if expr="not chromeos">
<message name="IDS_WELCOME_SUBHEADER" desc="A message which will appear underneath the header on the Welcome UI.">
The web browser by Google, for you
</message>
<message name="IDS_WELCOME_DESCRIPTION" desc="A message on the welcome page explaining the purpose of signing in.">
Sign in to Chrome with your Google Account to get your bookmarks, history, passwords, and other settings on all your devices.
</message>
<message name="IDS_WELCOME_ACCEPT_BUTTON" desc="A button on the welcome page which accepts the offer to sign in to Chrome.">
Sign in
</message>
<message name="IDS_WELCOME_DECLINE_BUTTON" desc="A button on the welcome page which declines the offer to sign in to Chrome.">
No thanks
</message>
</if>
<!-- Windows 10 toast strings -->
<if expr="is_win">
<message name="IDS_WIN10_TOAST_BROWSE_FAST" desc="Toast message variant: browse fast.">
......
chrome/app/google_chrome_strings.grd
View file @ 6302b21f
......@@ -1188,9 +1188,6 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@example.com</
<message name="IDS_WELCOME_HEADER" desc="A message which will appear as the header on the Welcome UI if the user has never run Chrome before.">
Welcome to Chrome
</message>
<message name="IDS_WELCOME_HEADER_AFTER_FIRST_RUN" desc="A message which will appear as the header on the Welcome UI if the user has run Chrome before.">
Take Chrome everywhere
</message>
</if>
<!-- Native notifications for Windows 10 -->
......
chrome/app/onboarding_welcome_strings.grdp
View file @ 6302b21f
<?xml version="1.0" encoding="utf-8"?>
<grit-part>
<!-- Shared strings -->
<message name="IDS_ONBOARDING_WELCOME_GET_STARTED" desc="Label for a confirmation button to finish adding a bookmark and get the user started with using the browser.">
Get started
</message>
<message name="IDS_ONBOARDING_WELCOME_NEXT" desc="Label for a button to confirm and continue from the current onboarding step.">
Next
</message>
......@@ -90,9 +87,6 @@
<message name="IDS_ONBOARDING_WELCOME_NUX_SET_AS_DEFAULT_SUB_HEADER" desc="Sub-header for the page that prompts user to set Chrome as their default browser.">
Get Google Search and Google smarts everytime you browse
</message>
<message name="IDS_ONBOARDING_WELCOME_NUX_SET_AS_DEFAULT_SKIP" desc="The label for a button to skip setting Chrome as their default browser.">
Skip
</message>
<message name="IDS_ONBOARDING_WELCOME_NUX_SET_AS_DEFAULT_SET_AS_DEFAULT" desc="The label for a button to confirm setting Chrome as their default browser.">
Set as default
</message>
......
chrome/browser/browser_resources.grd
View file @ 6302b21f
......@@ -67,11 +67,6 @@
</else>
</if>
</if>
<if expr="not is_android and not chromeos">
<structure name="IDR_WELCOME_CSS" file="resources\welcome\welcome.css" type="chrome_html" preprocess="true"/>
<structure name="IDR_WELCOME_HTML" file="resources\welcome\welcome.html" type="chrome_html" preprocess="true"/>
<structure name="IDR_WELCOME_JS" file="resources\welcome\welcome.js" type="chrome_html" preprocess="true"/>
</if>
<if expr="chromeos">
<structure name="IDR_FIRST_RUN_HTML" file="resources\chromeos\first_run\first_run.html" flattenhtml="true" type="chrome_html"/>
<structure name="IDR_FIRST_RUN_JS" file="resources\chromeos\first_run\first_run.js" flattenhtml="true" type="chrome_html" />
......
chrome/browser/resources/welcome/onboarding_welcome/set_as_default/nux_set_as_default.html
View file @ 6302b21f
......@@ -88,7 +88,7 @@
<div class="illustration slide-in" aria-hidden="true"></div>
<div class="button-bar">
<cr-button id="decline-button" on-click="onDeclineClick_">
$i18n{setDefaultSkip}
$i18n{skip}
</cr-button>
<step-indicator model="[[indicatorModel]]"></step-indicator>
<cr-button class="action-button" on-click="onSetDefaultClick_">
......
chrome/browser/resources/welcome/welcome.css deleted 100644 → 0
View file @ 8cfeb0df
/* Copyright 2016 The Chromium Authors. All rights reserved.
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file. */
body {
align-items: center;
box-sizing: border-box;
color: var(--paper-grey-900);
display: flex;
flex-direction: column;
font-size: 100%;
justify-content: center;
margin: 0;
min-height: 100vh;
padding: 8px;
}
@media (prefers-color-scheme: dark) {
body {
color: var(--cr-primary-text-color);
}
}
.watermark {
-webkit-mask-image: url(chrome://resources/images/google_logo.svg);
-webkit-mask-repeat: no-repeat;
-webkit-mask-size: 100%;
animation: fadeIn 1s cubic-bezier(0, 0, .2, 1) both;
background: var(--paper-grey-400);
bottom: 24px;
height: 24px;
position: absolute;
width: 74px;
}
@media (prefers-color-scheme: dark) {
.watermark {
background: var(--cr-secondary-text-color);
}
}
@media(max-height: 608px) {
.watermark {
display: none;
}
}
chrome/browser/resources/welcome/welcome.html deleted 100644 → 0
View file @ 8cfeb0df
<!doctype html>
<html dir="$i18n{textdirection}" lang="$i18n{language}">
<head>
<meta charset="utf-8">
<title>$i18n{headerText}</title>
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html">
<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
<link rel="import" href="chrome://resources/html/cr.html">
<link rel="import" href="chrome://resources/html/util.html">
<link rel="stylesheet" href="chrome://resources/css/md_colors.css">
<link rel="stylesheet" href="chrome://resources/css/text_defaults_md.css">
<link rel="stylesheet" href="chrome://welcome/welcome.css">
<style>
@media (prefers-color-scheme: dark) {
html {
background-color: var(--md-background-color);
}
}
</style>
<dom-module id="welcome-app">
<template>
<style>
@keyframes slideUpContent {
from {
transform: translateY(186px);
}
}
@keyframes fadeIn {
from {
opacity: 0;
}
}
@keyframes fadeOut {
to {
opacity: 0;
}
}
@keyframes fadeInAndSlideUp {
from {
opacity: 0;
transform: translateY(8px);
}
}
@keyframes spin {
from {
transform: rotate(1440deg) scale(0.8);
}
}
@keyframes fadeInAndSlideDownShadow {
from {
opacity: .6;
top: 0;
}
}
@keyframes scaleUp {
0% {
transform: scale(.8);
}
}
@keyframes colorize {
from {
filter: grayscale(100%) brightness(128%) contrast(20%) brightness(161%);
opacity: .6;
}
}
@keyframes bounce {
0% {
transform: matrix3d(0.8, 0, 0, 0, 0, 0.8, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
}
7.61% {
transform: matrix3d(0.907, 0, 0, 0, 0, 0.907, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
}
11.41% {
transform: matrix3d(0.948, 0, 0, 0, 0, 0.948, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
}
15.12% {
transform: matrix3d(0.976, 0, 0, 0, 0, 0.976, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
}
18.92% {
transform: matrix3d(0.996, 0, 0, 0, 0, 0.996, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
}
22.72% {
transform: matrix3d(1.008, 0, 0, 0, 0, 1.008, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
}
30.23% {
transform: matrix3d(1.014, 0, 0, 0, 0, 1.014, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
}
50.25% {
transform: matrix3d(1.003, 0, 0, 0, 0, 1.003, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
}
70.27% {
transform: matrix3d(0.999, 0, 0, 0, 0, 0.999, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
}
100% {
transform: matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
}
}
.content {
height: 100%;
overflow-y: hidden;
}
.slider {
align-items: center;
animation: slideUpContent 600ms 1.8s cubic-bezier(.4, .2, 0, 1) both;
display: flex;
flex: 1;
flex-direction: column;
justify-content: center;
max-width: 500px;
}
.heading {
animation: fadeInAndSlideUp 600ms 1.9s cubic-bezier(.4, .2, 0, 1) both;
font-size: 2.125em;
margin-bottom: .25em;
margin-top: 1.5em;
text-align: center;
}
.subheading {
animation: fadeInAndSlideUp 600ms 1.9s cubic-bezier(.4, .2, 0, 1) both;
color: rgb(95, 99, 104);
font-size: 1em;
font-weight: 500;
margin-top: .25em;
text-align: center;
}
@media (prefers-color-scheme: dark) {
.subheading {
color: var(--cr-secondary-text-color);
}
}
.logo {
animation: fadeIn 600ms both, bounce 1s 600ms linear both;
height: 96px;
position: relative;
width: 96px;
}
.logo-icon {
animation: spin 2.4s cubic-bezier(.4, .2, 0, 1) both,
colorize 300ms 700ms linear both;
background-image: -webkit-image-set(url(chrome://welcome/logo.png) 1x,
url(chrome://welcome/logo2x.png) 2x);
background-size: 100%;
height: 96px;
width: 96px;
}
.logo-shadow {
animation: fadeInAndSlideDownShadow 300ms 600ms both;
background: rgba(0, 0, 0, .2);
border-radius: 50%;
filter: blur(16px);
height: 96px;
position: absolute;
top: 16px;
width: 96px;
z-index: -1;
}
.signin {
animation: fadeInAndSlideUp 600ms 2s cubic-bezier(.4, .2, 0, 1) both;
margin-top: 3em;
}
.signin-description {
font-size: .875em;
line-height: 1.725em;
max-width: 344px;
}
.signin-buttons {
align-items: center;
display: flex;
flex-direction: column;
margin: auto;
margin-top: 2em;
width: fit-content;
}
cr-button {
font-size: .8125em;
/* Makes sure the two cr-button's are the same width since they're
placed vertically. Requires parent to be "width: fit-content;". */
width: 100%;
}
#cancel {
margin-bottom: 2px; /* Prevent focus ring from being chopped. */
margin-top: 1.5em;
}
</style>
<div class="content">
<div class="slider">
<div class="logo">
<div class="logo-icon" on-click="onLogoTap_"></div>
<div class="logo-shadow"></div>
</div>
<div class="heading">$i18n{headerText}</div>
<if expr="_google_chrome">
<div class="subheading">$i18n{subheaderText}</div>
</if>
<div class="signin">
<div class="signin-description">$i18n{descriptionText}</div>
<div class="signin-buttons">
<cr-button class="action-button" on-click="onAccept_">
$i18n{acceptText}
</cr-button>
<cr-button id="cancel" on-click="onDecline_">
$i18n{declineText}
</cr-button>
</div>
</div>
</div>
</div>
</template>
<script src="welcome.js"></script>
</dom-module>
</head>
<body>
<welcome-app></welcome-app>
<div class="watermark"></div>
</body>
</html>
chrome/browser/resources/welcome/welcome.js deleted 100644 → 0
View file @ 8cfeb0df
// Copyright 2016 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
Polymer({
is: 'welcome-app',
/** @private */
onAccept_: function() {
chrome.send('handleActivateSignIn');
},
/** @private */
onDecline_: function() {
chrome.send('handleUserDecline');
},
/** @private */
onLogoTap_: function() {
this.$$('.logo-icon')
.animate(
{
transform: ['none', 'rotate(-10turn)'],
},
/** @type {!KeyframeEffectOptions} */ ({
duration: 500,
easing: 'cubic-bezier(1, 0, 0, 1)',
}));
},
});
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