Commit 331d18fa authored by Anastasiia N's avatar Anastasiia N Committed by Chromium LUCI CQ

Revert "[ntp] Add flag to disable the logo"

This reverts commit 660b7591.

Reason for revert: https://crbug.com/1169070

Original change's description:
> [ntp] Add flag to disable the logo
>
> Makes the logo Finch-configurable. Flag is enabled by default.
>
> Bug: 1168361
> Change-Id: Ie9fbeebb5f88fcf6ca2d6a418759f65e61d3231e
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2639153
> Commit-Queue: Tibor Goldschwendt <tiborg@chromium.org>
> Reviewed-by: Esmael Elmoslimany <aee@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#845490}

TBR=tiborg@chromium.org,aee@chromium.org,chromium-scoped@luci-project-accounts.iam.gserviceaccount.com

Change-Id: Ifa4cd2f58ccf58452a32f0c89bc23fb07cb50a5d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1168361, 1169070
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2642327Reviewed-by: default avatarAnastasiia N <anastasiian@chromium.org>
Commit-Queue: Anastasiia N <anastasiian@chromium.org>
Cr-Commit-Position: refs/heads/master@{#845598}
parent 96317f7f
...@@ -253,12 +253,10 @@ ...@@ -253,12 +253,10 @@
hidden$="[[!oneGoogleBarLoaded_]]"> hidden$="[[!oneGoogleBarLoaded_]]">
</ntp-iframe> </ntp-iframe>
</template> </template>
<template is="dom-if" if="[[logoEnabled_]]"> <ntp-logo id="logo" doodle-allowed$="[[doodleAllowed_]]"
<ntp-logo id="logo" doodle-allowed$="[[doodleAllowed_]]" single-colored$="[[singleColoredLogo_]]" dark="[[theme_.isDark]]"
single-colored$="[[singleColoredLogo_]]" dark="[[theme_.isDark]]" background-color="[[backgroundColor_]]">
background-color="[[backgroundColor_]]"> </ntp-logo>
</ntp-logo>
</template>
<ntp-realbox id="realbox" on-open-voice-search="onOpenVoiceSearch_" <ntp-realbox id="realbox" on-open-voice-search="onOpenVoiceSearch_"
theme="[[theme_.searchBox]]" shown$="[[realboxShown_]]"> theme="[[theme_.searchBox]]" shown$="[[realboxShown_]]">
</ntp-realbox> </ntp-realbox>
......
...@@ -190,12 +190,6 @@ class AppElement extends PolymerElement { ...@@ -190,12 +190,6 @@ class AppElement extends PolymerElement {
computed: 'computeRealboxShown_(theme_)', computed: 'computeRealboxShown_(theme_)',
}, },
/** @private */
logoEnabled_: {
type: Boolean,
value: () => loadTimeData.getBoolean('logoEnabled'),
},
/** @private */ /** @private */
shortcutsEnabled_: { shortcutsEnabled_: {
type: Boolean, type: Boolean,
......
...@@ -100,8 +100,6 @@ content::WebUIDataSource* CreateNewTabPageUiHtmlSource(Profile* profile) { ...@@ -100,8 +100,6 @@ content::WebUIDataSource* CreateNewTabPageUiHtmlSource(Profile* profile) {
base::FeatureList::IsEnabled(ntp_features::kWebUIThemeModeDoodles)); base::FeatureList::IsEnabled(ntp_features::kWebUIThemeModeDoodles));
source->AddBoolean("shortcutsEnabled", source->AddBoolean("shortcutsEnabled",
base::FeatureList::IsEnabled(ntp_features::kNtpShortcuts)); base::FeatureList::IsEnabled(ntp_features::kNtpShortcuts));
source->AddBoolean("logoEnabled",
base::FeatureList::IsEnabled(ntp_features::kNtpLogo));
source->AddBoolean( source->AddBoolean(
"middleSlotPromoEnabled", "middleSlotPromoEnabled",
base::FeatureList::IsEnabled(ntp_features::kNtpMiddleSlotPromo)); base::FeatureList::IsEnabled(ntp_features::kNtpMiddleSlotPromo));
......
...@@ -75,9 +75,6 @@ const base::Feature kWebUI{"NtpWebUI", base::FEATURE_ENABLED_BY_DEFAULT}; ...@@ -75,9 +75,6 @@ const base::Feature kWebUI{"NtpWebUI", base::FEATURE_ENABLED_BY_DEFAULT};
const base::Feature kWebUIThemeModeDoodles{"WebUIThemeModeDoodles", const base::Feature kWebUIThemeModeDoodles{"WebUIThemeModeDoodles",
base::FEATURE_ENABLED_BY_DEFAULT}; base::FEATURE_ENABLED_BY_DEFAULT};
// If enabled, logo will be shown.
const base::Feature kNtpLogo{"NtpLogo", base::FEATURE_ENABLED_BY_DEFAULT};
// If enabled, shortcuts will be shown. // If enabled, shortcuts will be shown.
const base::Feature kNtpShortcuts{"NtpShortcuts", const base::Feature kNtpShortcuts{"NtpShortcuts",
base::FEATURE_ENABLED_BY_DEFAULT}; base::FEATURE_ENABLED_BY_DEFAULT};
......
...@@ -26,7 +26,6 @@ extern const base::Feature kRealboxMatchOmniboxTheme; ...@@ -26,7 +26,6 @@ extern const base::Feature kRealboxMatchOmniboxTheme;
extern const base::Feature kRealboxUseGoogleGIcon; extern const base::Feature kRealboxUseGoogleGIcon;
extern const base::Feature kWebUI; extern const base::Feature kWebUI;
extern const base::Feature kWebUIThemeModeDoodles; extern const base::Feature kWebUIThemeModeDoodles;
extern const base::Feature kNtpLogo;
extern const base::Feature kNtpShortcuts; extern const base::Feature kNtpShortcuts;
extern const base::Feature kNtpMiddleSlotPromo; extern const base::Feature kNtpMiddleSlotPromo;
extern const base::Feature kModules; extern const base::Feature kModules;
......
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