Skip to content

GitLab

T
tangled
Commit e29f5b81 authored by Aga Wronska's avatar Aga Wronska Committed by Commit Bot
Browse files
Options

Reland "Implement content of progress and error dialogs according to mocks." 

This reverts commit 4c2ee1dc.

Original change's description:
> Revert "Implement content of progress and error dialogs according to mocks."
>
> This reverts commit 1f7e073e.
>
> Reason for revert: Revert 1 of 2 - FindIt flagged https://crrev.com/c/1100237 with 100% confidence of breaking "Linux ChromiumOS MSan Tests" bot (DemoSetupTest.ProceedThroughSetupFlowSetupError); revering this CL is needed to be able to revert that one.
>
> Original change's description:
> > Implement content of progress and error dialogs according to mocks.
> >
> > Bug: 827376
> > Cq-Include-Trybots: luci.chromium.try:closure_compilation
> > Change-Id: I16781ef2ad241f28da0eef3126d9b6a66840f828
> > Reviewed-on: https://chromium-review.googlesource.com/1105568
> > Commit-Queue: Aga Wronska <agawronska@chromium.org>
> > Reviewed-by: Alexander Alekseev <alemate@chromium.org>
> > Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
> > Reviewed-by: Jun Mukai <mukai@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#571202}
>
> TBR=mukai@chromium.org,alemate@chromium.org,michaelpg@chromium.org,agawronska@chromium.org
>
> Change-Id: I86eba9fb27bc78941b9caab8c69bf983f17b19f0
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 827376, 858817
> Cq-Include-Trybots: luci.chromium.try:closure_compilation
> Reviewed-on: https://chromium-review.googlesource.com/1119267
> Reviewed-by: Carlos Knippschild <carlosk@chromium.org>
> Commit-Queue: Carlos Knippschild <carlosk@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#571283}

Change-Id: I80071a9c745712e4e9f5b58c730edfb1f3d716e7
Bug: 827376, 858817
Cq-Include-Trybots: luci.chromium.try:closure_compilation
Reviewed-on: https://chromium-review.googlesource.com/1119269
Commit-Queue: Aga Wronska <agawronska@chromium.org>
Reviewed-by: default avatarAlexander Alekseev <alemate@chromium.org>
Reviewed-by: default avatarAga Wronska <agawronska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#571664}
parent a05c9815
Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 7 deletions
chrome/app/chromeos_strings.grdp
View file @ e29f5b81
......@@ -1810,6 +1810,18 @@
<message name="IDS_OOBE_EULA_ACCEPT_AND_CONTINUE_BUTTON_TEXT" desc="Label on a button on the Title of Terms of Service OOBE screen to accept EULA and continue.">
Accept and continue
</message>
<message name="IDS_OOBE_DEMO_SETUP_PROGRESS_SCREEN_TITLE" desc="The title of the dialog that is shown when demo mode setup is in progress.">
Starting demo mode
</message>
<message name="IDS_OOBE_DEMO_SETUP_ERROR_SCREEN_TITLE" desc="The title of the dialog that is shown when demo mode setup failed.">
Couldn't start demo mode
</message>
<message name="IDS_OOBE_DEMO_SETUP_ERROR_SCREEN_SUBTITLE" desc="The subtitle of the dialog that is shown when demo mode setup failed.">
Please try again
</message>
<message name="IDS_OOBE_DEMO_SETUP_ERROR_SCREEN_RETRY_BUTTON_LABEL" desc="The label of the button that is shown on error screen and that retries demo mode setup with the previously chosen configuration.">
OK
</message>
<message name="IDS_LOGIN_SYNC_CONSENT_SCREEN_TITLE" desc="The title of the dialog that welcomes the user on the first log in, and explains Chrome Sync and privacy options.">
You're signed in!
</message>
......
chrome/browser/resources/chromeos/login/demo_setup.css
View file @ e29f5b81
......@@ -5,3 +5,9 @@
[slot='bottom-buttons'] {
padding: 0 6px;
}
/* Spinner shown on progress dialog. */
paper-spinner-lite {
height: 164px;
width: 164px;
}
chrome/browser/resources/chromeos/login/demo_setup.html
View file @ e29f5b81
<iron-iconset-svg name="demo-setup-32" size="32">
<svg>
<defs>
<g id="computer" fill="none" fill-rule="evenodd">
<path d="M0-4h32v32H0z"></path>
<path fill="#1A73E8" fill-rule="nonzero"d="M29 20V0H3v20H0v3h32v-3h-3zm-10.333 0h-5.334v-1.333h5.334V20zM26 16H6V3h20v13z"></path>
<path fill="#1A73E8" d="M16.97 8.129L16 5l-.97 3.129H12l2.47 1.836L13.53 13 16 11.123 18.47 13l-.94-3.035L20 8.129z"></path>
</g>
</defs>
</svg>
</iron-iconset-svg>
<iron-iconset-svg name="demo-setup-64" size="64">
<svg>
<defs>
<g id="computer" fill="none" fill-rule="evenodd">
<path d="M0 0h64v64H0z"></path>
<path fill="#1A73E8" fill-rule="nonzero" d="M58 48V8H6v40H0v6h64v-6h-6zm-20.667 0H26.667v-2.667h10.666V48zM52 40H12V14h40v26z"></path>
<path fill="#1A73E8" d="M33.94 24.258L32 18l-1.94 6.258H24l4.94 3.672L27.06 34 32 30.245 36.94 34l-1.88-6.07L40 24.258z"></path>
</g>
</defs>
</svg>
</iron-iconset-svg>
<dom-module id="demo-setup-md">
<template>
<link rel="stylesheet" href="demo_setup.css">
......@@ -25,16 +50,36 @@
</oobe-dialog>
<oobe-dialog id="demoSetupProgressDialog" role="dialog" has-buttons hidden>
<h1 slot="title">Starting demo mode</h1>
<hd-iron-icon slot="oobe-icon"
icon1x="demo-setup-32:computer" icon2x="demo-setup-64:computer">
</hd-iron-icon>
<h1 slot="title">
[[i18nDynamic(locale, 'demoSetupProgressScreenTitle')]]
</h1>
<div slot="footer" class="flex layout vertical center">
<paper-spinner-lite id="spinner" dir="ltr" active></paper-spinner-lite>
</div>
</oobe-dialog>
<oobe-dialog id="demoSetupErrorDialog" role="dialog" has-buttons hidden>
<h1 slot="title">Couldn't start demo mode</h1>
<div slot="subtitle">Please try again</div>
<oobe-dialog id="demoSetupErrorDialog" role="dialog" has-buttons hidden
aria-label$="[[i18nDynamic(locale, 'demoSetupErrorScreenTitle')]]">
<hd-iron-icon slot="oobe-icon"
icon1x="demo-setup-32:computer" icon2x="demo-setup-64:computer">
</hd-iron-icon>
<h1 slot="title">[[i18nDynamic(locale, 'demoSetupErrorScreenTitle')]]</h1>
<div slot="subtitle">
[[i18nDynamic(locale, 'demoSetupErrorScreenSubtitle')]]
</div>
<div slot="footer" class="flex layout vertical center">
<img srcset="images/alert-illustration_1x.svg 1x,
images/alert-illustration_2x.svg 2x">
</div>
<div slot="bottom-buttons" class="layout horizontal justified">
<oobe-back-button inverse on-tap="onCloseClicked_"></oobe-back-button>
<oobe-text-button inverse on-tap="onRetryClicked_">
<div>OK</div>
<oobe-text-button inverse on-tap="startSetup_">
<div>
[[i18nDynamic(locale, 'demoSetupErrorScreenRetryButtonLabel')]]
</div>
</oobe-text-button>
</div>
</oobe-dialog>
......
chrome/browser/resources/chromeos/login/demo_setup.js
View file @ e29f5b81
......@@ -10,6 +10,8 @@
Polymer({
is: 'demo-setup-md',
behaviors: [I18nBehavior, OobeDialogHostBehavior],
properties: {
/**
* Whether offline demo setup was selected. Available setup types: online
......
chrome/browser/resources/chromeos/login/images/alert-illustration_1x.svg 0 → 100644
View file @ e29f5b81
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="180" height="180">
<defs>
<path id="a" d="M0 164h164V0H0z"/>
</defs>
<g fill="none" fill-rule="evenodd" transform="translate(8 8)">
<path stroke="#E74133" stroke-linecap="round" stroke-width="4" d="M162 82c0 44.183-35.817 80-80 80S2 126.183 2 82 37.817 2 82 2s80 35.817 80 80z"/>
<mask id="b" fill="#fff">
<use xlink:href="#a"/>
</mask>
<path fill="#E74133" mask="url(#b)" d="M77 90h10V54H77zM77 109h10V97H77z"/>
</g>
</svg>
chrome/browser/resources/chromeos/login/images/alert-illustration_2x.svg 0 → 100644
View file @ e29f5b81
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="360" height="360">
<defs>
<path id="a" d="M0 328h328V0H0z"/>
</defs>
<g fill="none" fill-rule="evenodd" transform="translate(16 16)">
<path stroke="#E74133" stroke-linecap="round" stroke-width="8" d="M324 164c0 88.366-71.634 160-160 160S4 252.366 4 164 75.634 4 164 4s160 71.634 160 160z"/>
<mask id="b" fill="#fff">
<use xlink:href="#a"/>
</mask>
<path fill="#E74133" mask="url(#b)" d="M154 180h20v-72h-20zM154 218h20v-24h-20z"/>
</g>
</svg>
chrome/browser/ui/webui/chromeos/login/demo_setup_screen_handler.cc
View file @ e29f5b81
......@@ -7,6 +7,8 @@
#include "chrome/browser/chromeos/login/oobe_screen.h"
#include "chrome/browser/chromeos/login/screens/demo_setup_screen.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
#include "chrome/grit/generated_resources.h"
#include "components/login/localized_values_builder.h"
namespace {
......@@ -45,6 +47,15 @@ void DemoSetupScreenHandler::OnSetupFinished(bool is_success,
void DemoSetupScreenHandler::Initialize() {}
void DemoSetupScreenHandler::DeclareLocalizedValues(
::login::LocalizedValuesBuilder* builder) {}
::login::LocalizedValuesBuilder* builder) {
builder->Add("demoSetupProgressScreenTitle",
IDS_OOBE_DEMO_SETUP_PROGRESS_SCREEN_TITLE);
builder->Add("demoSetupErrorScreenTitle",
IDS_OOBE_DEMO_SETUP_ERROR_SCREEN_TITLE);
builder->Add("demoSetupErrorScreenSubtitle",
IDS_OOBE_DEMO_SETUP_ERROR_SCREEN_SUBTITLE);
builder->Add("demoSetupErrorScreenRetryButtonLabel",
IDS_OOBE_DEMO_SETUP_ERROR_SCREEN_RETRY_BUTTON_LABEL);
}
} // namespace chromeos
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