Commit 511b2241 authored by cjhopman@chromium.org's avatar cjhopman@chromium.org

Make the mobile welcome page the only default most visited page

BUG=138239


Review URL: https://chromiumcodereview.appspot.com/10831359

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152023 0039d316-1c4b-4281-b951-d872f2087c98
parent 450d9a36
......@@ -350,6 +350,11 @@
<message name="IDS_CHROME_WELCOME_URL" translateable="false">
http://www.google.com/chrome/intl/[GRITLANGCODE]/welcome.html
</message>
<if expr="pp_ifdef('android')">
<message name="IDS_MOBILE_WELCOME_URL" translateable="false">
chrome://welcome
</message>
</if>
<!-- The URL for Google Chrome OS welcome page. This is used for the -->
<!-- pre populated thumbnails. -->
......
......@@ -77,14 +77,20 @@ const TopSites::PrepopulatedPage kPrepopulatedPages[] = {
{ IDS_CHROMEOS_WELCOME_URL, IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE,
IDR_PRODUCT_LOGO_16, IDR_NEWTAB_CHROMEOS_WELCOME_PAGE_THUMBNAIL,
SkColorSetRGB(0, 147, 60) },
#elif defined(OS_ANDROID)
{ IDS_MOBILE_WELCOME_URL, IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE,
IDR_PRODUCT_LOGO_16, IDR_NEWTAB_CHROME_WELCOME_PAGE_THUMBNAIL,
SkColorSetRGB(0, 147, 60) }
#else
{ 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) },
#endif
#if !defined(OS_ANDROID)
{ IDS_WEBSTORE_URL, IDS_EXTENSION_WEB_STORE_TITLE,
IDR_WEBSTORE_ICON_16, IDR_NEWTAB_WEBSTORE_THUMBNAIL,
SkColorSetRGB(63, 132, 197) }
#endif
};
namespace {
......@@ -102,6 +108,9 @@ class LoadThumbnailsFromHistoryTask : public HistoryDBTask {
// l10n_util isn't thread safe, so cache for use on the db thread.
ignore_urls_.insert(l10n_util::GetStringUTF8(IDS_CHROME_WELCOME_URL));
ignore_urls_.insert(l10n_util::GetStringUTF8(IDS_WEBSTORE_URL));
#if defined(OS_ANDROID)
ignore_urls_.insert(l10n_util::GetStringUTF8(IDS_MOBILE_WELCOME_URL));
#endif
}
virtual bool RunOnDBThread(history::HistoryBackend* backend,
......
......@@ -367,7 +367,11 @@ class TopSites
DISALLOW_COPY_AND_ASSIGN(TopSites);
};
#if defined(OS_ANDROID)
extern const TopSites::PrepopulatedPage kPrepopulatedPages[1];
#else
extern const TopSites::PrepopulatedPage kPrepopulatedPages[2];
#endif
} // namespace history
......
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