Commit 7bb91f62 authored by Moe Ahmadi's avatar Moe Ahmadi Committed by Commit Bot

[ntp][modules] Remove the |name| field from the modules

Modules do not need names in addition to titles.

Bug: 1130799
Change-Id: I6475d1b1b72b5e94e7417dbf533b7684c051fd85
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2436374Reviewed-by: default avatarTibor Goldschwendt <tiborg@chromium.org>
Commit-Queue: Moe Ahmadi <mahmadi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#811439}
parent e41ad708
......@@ -5623,21 +5623,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_NTP_COLORS_DARK_PURPLE" desc="A color option in the customization menu on the New Tab Page.">
Dark purple
</message>
<message name="IDS_NTP_MODULES_DUMMY_NAME" translateable="false" desc="Name shown in the header of the dummy module.">
Dummy
</message>
<message name="IDS_NTP_MODULES_DUMMY_TITLE" translateable="false" desc="Title shown in the header of the dummy module.">
Super Duper Module
</message>
<message name="IDS_NTP_MODULES_DUMMY2_NAME" translateable="false" desc="Name shown in the header of the dummy 2 module.">
Dummy 2
</message>
<message name="IDS_NTP_MODULES_DUMMY2_TITLE" translateable="false" desc="Title shown in the header of the dummy 2 module.">
Even Better Module
</message>
<message name="IDS_NTP_MODULES_KALEIDOSCOPE_NAME" translateable="false" desc="Name shown in the header of the Kaleidoscope module.">
Kaleidoscope
</message>
<message name="IDS_NTP_MODULES_KALEIDOSCOPE_TITLE" desc="Title shown in the header of the Kaleidoscope module.">
Top picks for you
</message>
......
......@@ -88,7 +88,7 @@ customElements.define(DummyModuleElement.is, DummyModuleElement);
/** @type {!ModuleDescriptor} */
export const dummyDescriptor = new ModuleDescriptor(
/*id=*/ 'dummy', /*name=*/ loadTimeData.getString('modulesDummyName'),
/*id=*/ 'dummy',
/*heightPx=*/ 260, () => Promise.resolve({
element: new DummyModuleElement(),
title: loadTimeData.getString('modulesDummyTitle'),
......@@ -96,7 +96,7 @@ export const dummyDescriptor = new ModuleDescriptor(
/** @type {!ModuleDescriptor} */
export const dummyDescriptor2 = new ModuleDescriptor(
/*id=*/ 'dummy2', /*name=*/ loadTimeData.getString('modulesDummy2Name'),
/*id=*/ 'dummy2',
/*heightPx=*/ 260, () => Promise.resolve({
element: new DummyModuleElement(),
title: loadTimeData.getString('modulesDummy2Title'),
......
......@@ -55,7 +55,6 @@ function loadResource(resource) {
/** @type {!ModuleDescriptor} */
export const kaleidoscopeDescriptor = new ModuleDescriptor(
/*id=*/ 'kaleidoscope',
/*name=*/ loadTimeData.getString('modulesKaleidoscopeName'),
/*heightPx=*/ 330,
async () => {
// Load all the Kaleidoscope resources into the NTP and return the module
......
......@@ -18,15 +18,12 @@ let InitializeModuleCallback;
export class ModuleDescriptor {
/**
* @param {string} id
* @param {string} name
* @param {number} heightPx
* @param {!InitializeModuleCallback} initializeCallback
*/
constructor(id, name, heightPx, initializeCallback) {
constructor(id, heightPx, initializeCallback) {
/** @private {string} */
this.id_ = id;
/** @private {string} */
this.name_ = name;
/** @private {number} */
this.heightPx_ = heightPx;
/** @private {?string} */
......@@ -42,11 +39,6 @@ export class ModuleDescriptor {
return this.id_;
}
/** @return {string} */
get name() {
return this.name_;
}
/** @return {number} */
get heightPx() {
return this.heightPx_;
......
......@@ -18,11 +18,6 @@
color: var(--cr-primary-text-color);
}
#name {
color: var(--cr-secondary-text-color);
white-space: pre;
}
#moduleElement {
align-items: center;
display: flex;
......@@ -31,6 +26,5 @@
</style>
<div id="header">
<span id="title">[[descriptor.title]]</span>
<span id="name"> • [[descriptor.name]]</span>
</div>
<div id="moduleElement"></div>
......@@ -52,5 +52,4 @@ async function createModule() {
/** @type {!ModuleDescriptor} */
export const shoppingTasksDescriptor = new ModuleDescriptor(
/*id=*/ 'shopping_tasks',
/*name=*/ 'Shopping Tasks',
/*heightPx=*/ 270, createModule);
......@@ -181,11 +181,8 @@ content::WebUIDataSource* CreateNewTabPageUiHtmlSource(Profile* profile) {
{"themeCreatedBy", IDS_NEW_TAB_ATTRIBUTION_INTRO},
// Modules.
{"modulesDummyName", IDS_NTP_MODULES_DUMMY_NAME},
{"modulesDummyTitle", IDS_NTP_MODULES_DUMMY_TITLE},
{"modulesDummy2Name", IDS_NTP_MODULES_DUMMY2_NAME},
{"modulesDummy2Title", IDS_NTP_MODULES_DUMMY2_TITLE},
{"modulesKaleidoscopeName", IDS_NTP_MODULES_KALEIDOSCOPE_NAME},
{"modulesKaleidoscopeTitle", IDS_NTP_MODULES_KALEIDOSCOPE_TITLE},
};
AddLocalizedStringsBulk(source, kStrings);
......
......@@ -12,12 +12,12 @@ suite('NewTabPageModulesModuleRegistryTest', () => {
const bazModule = document.createElement('div');
const bazModuleResolver = new PromiseResolver();
ModuleRegistry.getInstance().registerModules([
new ModuleDescriptor('foo', 'Foo', 100, () => Promise.resolve({
new ModuleDescriptor('foo', 100, () => Promise.resolve({
element: fooModule,
title: 'Foo Title',
})),
new ModuleDescriptor('bar', 'Bar', 200, () => null),
new ModuleDescriptor('baz', 'Baz', 300, () => bazModuleResolver.promise),
new ModuleDescriptor('bar', 200, () => null),
new ModuleDescriptor('baz', 300, () => bazModuleResolver.promise),
]);
// Act.
......@@ -32,12 +32,10 @@ suite('NewTabPageModulesModuleRegistryTest', () => {
// Assert.
assertEquals(2, modules.length);
assertEquals('foo', modules[0].id);
assertEquals('Foo', modules[0].name);
assertEquals(100, modules[0].heightPx);
assertEquals('Foo Title', modules[0].title);
assertDeepEquals(fooModule, modules[0].element);
assertEquals('baz', modules[1].id);
assertEquals('Baz', modules[1].name);
assertEquals(300, modules[1].heightPx);
assertEquals('Baz Title', modules[1].title);
assertDeepEquals(bazModule, modules[1].element);
......
......@@ -21,7 +21,6 @@ suite('NewTabPageModulesModuleWrapperTest', () => {
// Act.
moduleWrapper.descriptor = {
id: 'foo',
name: 'Foo',
heightPx: 100,
title: 'Foo Title',
element: moduleElement,
......@@ -29,7 +28,6 @@ suite('NewTabPageModulesModuleWrapperTest', () => {
// Assert.
assertEquals('Foo Title', moduleWrapper.$.title.textContent);
assertEquals(' • Foo', moduleWrapper.$.name.textContent);
assertEquals(100, $$(moduleWrapper, '#moduleElement').offsetHeight);
assertDeepEquals(
moduleElement, $$(moduleWrapper, '#moduleElement').children[0]);
......
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