Commit 3cef5025 authored by Alexander Alekseev's avatar Alexander Alekseev Committed by Commit Bot

Chrome OS Discover: Add Redeem Offers module.

Bug: 862852
Change-Id: I045023abf2a303f9ee0f08afc340ccbac9929a55
Reviewed-on: https://chromium-review.googlesource.com/1188485
Commit-Queue: Alexander Alekseev <alemate@chromium.org>
Reviewed-by: default avatarJacob Dufault <jdufault@chromium.org>
Cr-Commit-Position: refs/heads/master@{#586133}
parent c48ae8bf
...@@ -1982,6 +1982,9 @@ ...@@ -1982,6 +1982,9 @@
<message name="IDS_DISCOVER_WELCOME_SUBTITLE" desc="A subtitle title of the dialog that starts initial device setup process, explaining the benefits of going through this process."> <message name="IDS_DISCOVER_WELCOME_SUBTITLE" desc="A subtitle title of the dialog that starts initial device setup process, explaining the benefits of going through this process.">
Set up your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> just as you want it and discover all the amazing capabilities at your fingertips. Set up your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> just as you want it and discover all the amazing capabilities at your fingertips.
</message> </message>
<message name="IDS_DISCOVER_REDEEM_YOUR_OFFERS" desc="A label on the button that leads to the new web page where happy owner of the new device can redeem exclusive Google offers.">
Redeem your offers
</message>
<message name="IDS_APP_START_NETWORK_WAIT_MESSAGE" desc="Message displayed while installing and/or launching web application in kiosk mode."> <message name="IDS_APP_START_NETWORK_WAIT_MESSAGE" desc="Message displayed while installing and/or launching web application in kiosk mode.">
Waiting for network connection... Waiting for network connection...
</message> </message>
......
f836f8280fc53c33a68719c8b8816f9891fdabce
\ No newline at end of file
<include src="discover_card.html"> <include src="discover_card.html">
<!-- Add modules here --> <include src="modules/discover_module_redeem_offers.html">
<include src="discover_welcome.html"> <include src="discover_welcome.html">
<include src="discover_ui.html"> <include src="discover_ui.html">
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
// <include src="discover_module_behavior.js"> // <include src="discover_module_behavior.js">
// <include src="discover_card.js"> // <include src="discover_card.js">
// --- Modules // --- Modules.
// TODO: add modules here. // <include src="modules/discover_module_redeem_offers.js">
// --- These depend on modules. // --- These depend on modules.
// <include src="discover_welcome.js"> // <include src="discover_welcome.js">
......
...@@ -34,12 +34,6 @@ ...@@ -34,12 +34,6 @@
<discover-redeem-offers-card class="card" slot="cards" <discover-redeem-offers-card class="card" slot="cards"
module="redeem-offers"> module="redeem-offers">
</discover-redeem-offers-card> </discover-redeem-offers-card>
<discover-launch-help-app-card class="card" slot="cards"
module="launch-help-app">
</discover-launch-help-app-card>
<discover-sync-files-card class="card" slot="cards"
module="sync-files">
</discover-sync-files-card>
</discover-welcome> </discover-welcome>
<!-- TODO (alemate): add modules --> <!-- TODO (alemate): add modules -->
</template> </template>
......
...@@ -15,6 +15,9 @@ ...@@ -15,6 +15,9 @@
updateLocalizedContent: function() { updateLocalizedContent: function() {
this.i18nUpdateLocale(); this.i18nUpdateLocale();
this.propagateUpdateLocalizedContent('.card');
this.propagateUpdateLocalizedContent('#discoverWelcome');
this.propagateUpdateLocalizedContent('.module');
}, },
/* /*
......
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
<link rel="import" href="chrome://resources/cr_elements/shared_style_css.html">
<link rel="import" href="chrome://resources/html/i18n_behavior.html">
<dom-module id="discover-redeem-offers-card">
<template>
<discover-card highlight on-click="onClick_">
<if expr="chromeos and _google_chrome">
<img slot="background"
srcset="../../../../../internal/resources/chromeos/discover/redeem_offers/highlight_image_1x.png 1x,
../../../../../internal/resources/chromeos/discover/redeem_offers/highlight_image_2x.png 2x">
<img slot="icon"
srcset="../../../../../internal/resources/chromeos/discover/redeem_offers/highlight_icon_1x.png 1x,
../../../../../internal/resources/chromeos/discover/redeem_offers/highlight_icon_2x.png 2x">
</if>
<div slot="title">
[[i18nDynamic(locale, 'discoverRedeemYourOffers')]]
</div>
</discover-card>
</template>
</dom-module>
// Copyright 2018 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: 'discover-redeem-offers-card',
behaviors: [DiscoverModuleBehavior],
onClick_: function() {
window.open('http://www.google.com/chromebook/offers/', '_blank');
},
});
...@@ -1992,6 +1992,8 @@ jumbo_split_static_library("ui") { ...@@ -1992,6 +1992,8 @@ jumbo_split_static_library("ui") {
"webui/chromeos/login/discover/discover_window_manager.cc", "webui/chromeos/login/discover/discover_window_manager.cc",
"webui/chromeos/login/discover/discover_window_manager.h", "webui/chromeos/login/discover/discover_window_manager.h",
"webui/chromeos/login/discover/discover_window_manager_observer.h", "webui/chromeos/login/discover/discover_window_manager_observer.h",
"webui/chromeos/login/discover/modules/discover_module_redeem_offers.cc",
"webui/chromeos/login/discover/modules/discover_module_redeem_offers.h",
"webui/chromeos/login/discover/modules/discover_module_welcome.cc", "webui/chromeos/login/discover/modules/discover_module_welcome.cc",
"webui/chromeos/login/discover/modules/discover_module_welcome.h", "webui/chromeos/login/discover/modules/discover_module_welcome.h",
"webui/chromeos/login/discover_screen_handler.cc", "webui/chromeos/login/discover_screen_handler.cc",
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include "base/logging.h" #include "base/logging.h"
#include "chrome/browser/ui/webui/chromeos/login/discover/discover_handler.h" #include "chrome/browser/ui/webui/chromeos/login/discover/discover_handler.h"
#include "chrome/browser/ui/webui/chromeos/login/discover/modules/discover_module_redeem_offers.h"
#include "chrome/browser/ui/webui/chromeos/login/discover/modules/discover_module_welcome.h" #include "chrome/browser/ui/webui/chromeos/login/discover/modules/discover_module_welcome.h"
namespace chromeos { namespace chromeos {
...@@ -27,6 +28,8 @@ bool DiscoverManager::IsCompleted() const { ...@@ -27,6 +28,8 @@ bool DiscoverManager::IsCompleted() const {
} }
void DiscoverManager::CreateModules() { void DiscoverManager::CreateModules() {
modules_[DiscoverModuleRedeemOffers::kModuleName] =
std::make_unique<DiscoverModuleRedeemOffers>();
modules_[DiscoverModuleWelcome::kModuleName] = modules_[DiscoverModuleWelcome::kModuleName] =
std::make_unique<DiscoverModuleWelcome>(); std::make_unique<DiscoverModuleWelcome>();
} }
......
// Copyright 2018 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.
#include "chrome/browser/ui/webui/chromeos/login/discover/modules/discover_module_redeem_offers.h"
#include "chrome/browser/ui/webui/chromeos/login/discover/discover_handler.h"
#include "chrome/grit/generated_resources.h"
#include "components/login/localized_values_builder.h"
#include "ui/chromeos/devicetype_utils.h"
namespace chromeos {
namespace {
class DiscoverModuleRedeemOffersHandler : public DiscoverHandler {
public:
DiscoverModuleRedeemOffersHandler();
~DiscoverModuleRedeemOffersHandler() override = default;
private:
// BaseWebUIHandler: implementation
void DeclareLocalizedValues(
::login::LocalizedValuesBuilder* builder) override;
void Initialize() override;
void RegisterMessages() override;
DISALLOW_COPY_AND_ASSIGN(DiscoverModuleRedeemOffersHandler);
};
DiscoverModuleRedeemOffersHandler::DiscoverModuleRedeemOffersHandler()
: DiscoverHandler(DiscoverModuleRedeemOffers::kModuleName) {}
void DiscoverModuleRedeemOffersHandler::DeclareLocalizedValues(
::login::LocalizedValuesBuilder* builder) {
builder->Add("discoverRedeemYourOffers", IDS_DISCOVER_REDEEM_YOUR_OFFERS);
}
void DiscoverModuleRedeemOffersHandler::Initialize() {}
void DiscoverModuleRedeemOffersHandler::RegisterMessages() {}
} // anonymous namespace
/* ***************************************************************** */
/* Discover RedeemOffers module implementation below. */
const char DiscoverModuleRedeemOffers::kModuleName[] = "redeem-offers";
DiscoverModuleRedeemOffers::DiscoverModuleRedeemOffers() = default;
DiscoverModuleRedeemOffers::~DiscoverModuleRedeemOffers() = default;
bool DiscoverModuleRedeemOffers::IsCompleted() const {
return false;
}
std::unique_ptr<DiscoverHandler>
DiscoverModuleRedeemOffers::CreateWebUIHandler() const {
return std::make_unique<DiscoverModuleRedeemOffersHandler>();
}
} // namespace chromeos
// Copyright 2018 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.
#ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_DISCOVER_MODULES_DISCOVER_MODULE_REDEEM_OFFERS_H_
#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_DISCOVER_MODULES_DISCOVER_MODULE_REDEEM_OFFERS_H_
#include <memory>
#include "base/macros.h"
#include "chrome/browser/ui/webui/chromeos/login/discover/discover_module.h"
namespace chromeos {
class DiscoverModuleRedeemOffers : public DiscoverModule {
public:
DiscoverModuleRedeemOffers();
~DiscoverModuleRedeemOffers() override;
// DiscoverModule:
bool IsCompleted() const override;
std::unique_ptr<DiscoverHandler> CreateWebUIHandler() const override;
// Module name.
static const char kModuleName[];
private:
DISALLOW_COPY_AND_ASSIGN(DiscoverModuleRedeemOffers);
};
} // namespace chromeos
#endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_DISCOVER_MODULES_DISCOVER_MODULE_REDEEM_OFFERS_H_
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