Skip to content

GitLab

T
tangled
Commit 9c11f4db authored by kristipark's avatar kristipark Committed by Commit Bot
Browse files
Options

Remove welcome page from pre-populated Most Visited 

The URL is incorrect due to the welcome page migration (it currently redirects to chrome.com). Also, users have already been through the first run UX, so the welcome page is not really needed.

Bug: 824038
Change-Id: I739e920e2fd4f4498226a04e162b29f2ed1011c7
Reviewed-on: https://chromium-review.googlesource.com/1006186
Commit-Queue: Kristi Park <kristipark@chromium.org>
Reviewed-by: default avatarMarc Treib <treib@chromium.org>
Reviewed-by: default avataragrieve <agrieve@chromium.org>
Reviewed-by: default avatarMitsuru Oshima <oshima@chromium.org>
Reviewed-by: default avatarSylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#551388}
parent 7bd301ef
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 71 deletions
chrome/app/chromium_strings.grd
View file @ 9c11f4db
......@@ -261,18 +261,6 @@ If you update this file, be sure also to update google_chrome_strings.grd. -->
<message name="IDS_FR_CUSTOMIZE_DEFAULT_BROWSER" desc="Default browser checkbox label">
Make Chromium the default browser
</message>
<if expr="chromeos">
<message name="IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE"
desc="Title for the hard-coded thumbnail that represents the Chromium OS Welcome page. This is used on the NTP when there aren't enough thumbnails to show.">
Get Started with Chromium OS
</message>
</if>
<if expr="not chromeos">
<message name="IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE"
desc="Title for the hard-coded thumbnail that represents the Google Chrome Welcome page. This is used on the NTP when there aren't enough thumbnails to show.">
Welcome to Chromium
</message>
</if>
<if expr="chromeos">
<message name="IDS_EXTERNAL_PROTOCOL_TITLE" desc="External Protocol Dialog Title">
Chromium OS can't open this page.
......
chrome/app/google_chrome_strings.grd
View file @ 9c11f4db
......@@ -271,18 +271,6 @@ chromium_strings.grd. -->
<message name="IDS_FR_CUSTOMIZE_DEFAULT_BROWSER" desc="Default browser checkbox label">
Make Google Chrome the default browser
</message>
<if expr="chromeos">
<message name="IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE"
desc="Title for the hard-coded thumbnail that represents the Google Chrome Welcome page. This is used on the NTP when there aren't enough thumbnails to show.">
Get Started with Chrome OS
</message>
</if>
<if expr="not chromeos">
<message name="IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE"
desc="Title for the hard-coded thumbnail that represents the Google Chrome OS Welcome page. This is used on the NTP when there aren't enough thumbnails to show.">
Welcome to Google Chrome
</message>
</if>
<if expr="chromeos">
<message name="IDS_EXTERNAL_PROTOCOL_TITLE" desc="External Protocol Dialog Title">
Google Chrome OS can't open this page.
......
chrome/app/resources/locale_settings.grd
View file @ 9c11f4db
......@@ -184,17 +184,6 @@
https://chrome.google.com/webstore?hl=[GRITLANGCODE]
</message>
<!-- The URL for Google Chrome welcome page. This is used for the pre -->
<!-- populated thumbnails. -->
<message name="IDS_CHROME_WELCOME_URL" translateable="false">
http://www.google.com/chrome/intl/[GRITLANGCODE]/welcome.html
</message>
<if expr="is_android">
<message name="IDS_MOBILE_WELCOME_URL" translateable="false">
chrome://welcome
</message>
</if>
<!-- The URLs for Adobe Flash settings. We cannot rely on -->
<!-- the automatic expansion of GRITLANGCODE here because Adobe does -->
<!-- not use the language/locale code. -->
......
chrome/app/theme/theme_resources.grd
View file @ 9c11f4db
......@@ -211,12 +211,6 @@
<if expr="chromeos">
<structure type="chrome_scaled_image" name="IDR_NETWORK_ADD_CONNECTION" file="cros/network_add_connection.png" />
</if>
<if expr="chromeos">
<structure type="chrome_scaled_image" name="IDR_NEWTAB_CHROME_WELCOME_PAGE_THUMBNAIL" file="cros/ntp_welcome_thumb.png" />
</if>
<if expr="not chromeos">
<structure type="chrome_scaled_image" name="IDR_NEWTAB_CHROME_WELCOME_PAGE_THUMBNAIL" file="common/ntp_welcome_thumb.png" />
</if>
<structure type="chrome_scaled_image" name="IDR_NEWTAB_WEBSTORE_THUMBNAIL" file="ntp_webstore_thumb.png" />
<if expr="chromeos">
<structure type="chrome_scaled_image" name="IDR_NOTIFICATION_DRIVE" file="cros/notification_drive.png" />
......
chrome/browser/history/top_sites_factory.cc
View file @ 9c11f4db
......@@ -55,13 +55,6 @@ struct RawPrepopulatedPage {
#if !defined(OS_ANDROID)
// Android does not use prepopulated pages.
const RawPrepopulatedPage kRawPrepopulatedPages[] = {
{
IDS_CHROME_WELCOME_URL,
IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE,
IDR_PRODUCT_LOGO_16,
IDR_NEWTAB_CHROME_WELCOME_PAGE_THUMBNAIL,
SkColorSetRGB(0, 147, 60),
},
{
IDS_WEBSTORE_URL,
IDS_EXTENSION_WEB_STORE_TITLE,
......
chrome/browser/ui/search/local_ntp_browsertest.cc
View file @ 9c11f4db
......@@ -52,9 +52,9 @@
namespace {
// In a non-signed-in, fresh profile with no history, there should be two
// default TopSites tiles (see history::PrepopulatedPage).
const int kDefaultMostVisitedItemCount = 2;
// In a non-signed-in, fresh profile with no history, there should be one
// default TopSites tile (see history::PrepopulatedPage).
const int kDefaultMostVisitedItemCount = 1;
class TestMostVisitedObserver : public InstantServiceObserver {
public:
......@@ -408,19 +408,18 @@ IN_PROC_BROWSER_TEST_F(LocalNTPTest, GoogleNTPLoadsWithoutError) {
histograms.ExpectTotalCount("NewTabPage.TilesReceivedTime.LocalNTP", 1);
histograms.ExpectTotalCount("NewTabPage.TilesReceivedTime.MostVisited", 1);
// Make sure impression metrics were recorded. There should be 2 tiles, the
// Make sure impression metrics were recorded. There should be 1 tile, the
// default prepopulated TopSites (see history::PrepopulatedPage).
histograms.ExpectTotalCount("NewTabPage.NumberOfTiles", 1);
histograms.ExpectBucketCount("NewTabPage.NumberOfTiles", 2, 1);
histograms.ExpectTotalCount("NewTabPage.SuggestionsImpression", 2);
histograms.ExpectBucketCount("NewTabPage.NumberOfTiles", 1, 1);
histograms.ExpectTotalCount("NewTabPage.SuggestionsImpression", 1);
histograms.ExpectBucketCount("NewTabPage.SuggestionsImpression", 0, 1);
histograms.ExpectBucketCount("NewTabPage.SuggestionsImpression", 1, 1);
histograms.ExpectTotalCount("NewTabPage.SuggestionsImpression.client", 2);
histograms.ExpectTotalCount("NewTabPage.SuggestionsImpression.Thumbnail", 2);
histograms.ExpectTotalCount("NewTabPage.TileTitle", 2);
histograms.ExpectTotalCount("NewTabPage.TileTitle.client", 2);
histograms.ExpectTotalCount("NewTabPage.TileType", 2);
histograms.ExpectTotalCount("NewTabPage.TileType.client", 2);
histograms.ExpectTotalCount("NewTabPage.SuggestionsImpression.client", 1);
histograms.ExpectTotalCount("NewTabPage.SuggestionsImpression.Thumbnail", 1);
histograms.ExpectTotalCount("NewTabPage.TileTitle", 1);
histograms.ExpectTotalCount("NewTabPage.TileTitle.client", 1);
histograms.ExpectTotalCount("NewTabPage.TileType", 1);
histograms.ExpectTotalCount("NewTabPage.TileType.client", 1);
}
IN_PROC_BROWSER_TEST_F(LocalNTPTest, NonGoogleNTPLoadsWithoutError) {
......@@ -460,19 +459,18 @@ IN_PROC_BROWSER_TEST_F(LocalNTPTest, NonGoogleNTPLoadsWithoutError) {
histograms.ExpectTotalCount("NewTabPage.TilesReceivedTime.LocalNTP", 1);
histograms.ExpectTotalCount("NewTabPage.TilesReceivedTime.MostVisited", 1);
// Make sure impression metrics were recorded. There should be 2 tiles, the
// Make sure impression metrics were recorded. There should be 1 tile, the
// default prepopulated TopSites (see history::PrepopulatedPage).
histograms.ExpectTotalCount("NewTabPage.NumberOfTiles", 1);
histograms.ExpectBucketCount("NewTabPage.NumberOfTiles", 2, 1);
histograms.ExpectTotalCount("NewTabPage.SuggestionsImpression", 2);
histograms.ExpectBucketCount("NewTabPage.NumberOfTiles", 1, 1);
histograms.ExpectTotalCount("NewTabPage.SuggestionsImpression", 1);
histograms.ExpectBucketCount("NewTabPage.SuggestionsImpression", 0, 1);
histograms.ExpectBucketCount("NewTabPage.SuggestionsImpression", 1, 1);
histograms.ExpectTotalCount("NewTabPage.SuggestionsImpression.client", 2);
histograms.ExpectTotalCount("NewTabPage.SuggestionsImpression.Thumbnail", 2);
histograms.ExpectTotalCount("NewTabPage.TileTitle", 2);
histograms.ExpectTotalCount("NewTabPage.TileTitle.client", 2);
histograms.ExpectTotalCount("NewTabPage.TileType", 2);
histograms.ExpectTotalCount("NewTabPage.TileType.client", 2);
histograms.ExpectTotalCount("NewTabPage.SuggestionsImpression.client", 1);
histograms.ExpectTotalCount("NewTabPage.SuggestionsImpression.Thumbnail", 1);
histograms.ExpectTotalCount("NewTabPage.TileTitle", 1);
histograms.ExpectTotalCount("NewTabPage.TileTitle.client", 1);
histograms.ExpectTotalCount("NewTabPage.TileType", 1);
histograms.ExpectTotalCount("NewTabPage.TileType.client", 1);
}
IN_PROC_BROWSER_TEST_F(LocalNTPTest, FrenchGoogleNTPLoadsWithoutError) {
......
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