ntp: use web store as default mv tile instead of themes gallery

BUG=90558
TEST=none

Review URL: http://codereview.chromium.org/7529051

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96040 0039d316-1c4b-4281-b951-d872f2087c98

13 files changed, 17 insertions, 21 deletions

diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index 2e1260b..2617acb 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -342,10 +342,6 @@ be available for now. -->
                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>
-      <message name="IDS_NEW_TAB_THEMES_GALLERY_PAGE_TITLE"
-         desc="Title for the hard coded thumbnail that represents the Themes Gallery page. This is used on the NTP when there aren't enough thumbnails to show.">
-        Chromium Themes Gallery
-      </message>
       <if expr="not pp_ifdef('chromeos')">
         <message name="IDS_EXTERNAL_PROTOCOL_INFORMATION" desc="General information about what Chrome is trying to do when opening this external protocol">
           Chromium needs to launch an external application to handle <ph name="SCHEME">$1<ex>acrobat:</ex></ph> links. The link requested is <ph name="PROTOLINK">$2<ex>acrobat:yourpdf</ex></ph>.
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 2774667..86face9 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -8316,6 +8316,10 @@ Keep your key file in a safe place. You will need it to create new versions of y
                desc="Text for the trash can that appears when the user drags apps.">
         Remove from <ph name="SHORT_PRODUCT_NAME">$1<ex>Chrome</ex></ph>.
       </message>
+      <message name="IDS_NEW_TAB_WEBSTORE_PAGE_TITLE"
+         desc="Title for the hard coded thumbnail that represents the webstore page. This is used on the NTP when there aren't enough thumbnails to show.">
+        Apps, Extensions and Themes
+      </message>
       <message name="IDS_APP_DEFAULT_PAGE_NAME"
                desc="Default name for the first 'Apps' page on the New Tab Page.">
         Apps
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index de476f7..b43512f 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -320,10 +320,6 @@ Chrome supports. -->
                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 Google Chrome
       </message>
-      <message name="IDS_NEW_TAB_THEMES_GALLERY_PAGE_TITLE"
-         desc="Title for the hard coded thumbnail that represents the Themes Gallery page. This is used on the NTP when there aren't enough thumbnails to show.">
-        Google Chrome Themes Gallery
-      </message>
       <if expr="not pp_ifdef('chromeos')">
         <message name="IDS_EXTERNAL_PROTOCOL_INFORMATION" desc="General information about what Chrome is trying to do when opening this external protocol">
           Google Chrome needs to launch an external application to handle <ph name="SCHEME">$1<ex>acrobat:</ex></ph> links. The link requested is <ph name="PROTOLINK">$2<ex>acrobat:yourpdf</ex></ph>.
diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd
index b2391c2f..d7037d8 100644
--- a/chrome/app/resources/locale_settings.grd
+++ b/chrome/app/resources/locale_settings.grd
@@ -451,6 +451,11 @@
         https://chrome.google.com/webstore?hl=[GRITLANGCODE]&amp;category=theme
       </message>
 
+      <!-- The URL for the webstore. -->
+      <message name="IDS_WEBSTORE_URL" translateable="false">
+        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">
diff --git a/chrome/app/theme/ntp_store_thumb.png b/chrome/app/theme/ntp_store_thumb.png
deleted file mode 100644
index f007ca3..0000000
--- a/chrome/app/theme/ntp_store_thumb.png
+++ /dev/null
diff --git a/chrome/app/theme/ntp_themes_gallery_thumb.png b/chrome/app/theme/ntp_themes_gallery_thumb.png
deleted file mode 100644
index 418f7af..0000000
--- a/chrome/app/theme/ntp_themes_gallery_thumb.png
+++ /dev/null
diff --git a/chrome/app/theme/ntp_webstore_thumb.png b/chrome/app/theme/ntp_webstore_thumb.png
new file mode 100644
index 0000000..468698e
--- /dev/null
+++ b/chrome/app/theme/ntp_webstore_thumb.png
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index ff25c8e..027d249 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -157,7 +157,7 @@
       <include name="IDR_NEWTAB_OPTION" file="ntp_option.png" type="BINDATA" />
       <include name="IDR_NEWTAB_OPTION_H" file="ntp_option_h.png" type="BINDATA" />
       <include name="IDR_NEWTAB_OPTION_P" file="ntp_option_p.png" type="BINDATA" />
-      <include name="IDR_NEWTAB_THEMES_GALLERY_THUMBNAIL" file="ntp_themes_gallery_thumb.png" type="BINDATA" />
+      <include name="IDR_NEWTAB_WEBSTORE_THUMBNAIL" file="ntp_webstore_thumb.png" type="BINDATA" />
       <include name="IDR_OMNIBOX_EXTENSION_APP" file="omnibox_extension_app.png" type="BINDATA" />
       <include name="IDR_OMNIBOX_EXTENSION_APP_DARK" file="omnibox_extension_app_dark.png" type="BINDATA" />
       <include name="IDR_OMNIBOX_EXTENSION_APP_SELECTED" file="omnibox_extension_app_selected.png" type="BINDATA" />
diff --git a/chrome/browser/history/top_sites.cc b/chrome/browser/history/top_sites.cc
index 168692c..1c1746a 100644
--- a/chrome/browser/history/top_sites.cc
+++ b/chrome/browser/history/top_sites.cc
@@ -55,7 +55,7 @@ static const int64 kMaxUpdateIntervalMinutes = 60;
 
 // IDs of the sites we force into top sites.
 static const int kPrepopulatePageIDs[] =
-    { IDS_CHROME_WELCOME_URL, IDS_THEMES_GALLERY_URL };
+    { IDS_CHROME_WELCOME_URL, IDS_WEBSTORE_URL };
 
 // Favicons of the sites we force into top sites.
 static const char kPrepopulateFaviconURLs[][100] =
@@ -68,7 +68,7 @@ static const char kNewPrepopulateFaviconURLs[][100] =
 
 static const int kPrepopulateTitleIDs[] =
     { IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE,
-      IDS_NEW_TAB_THEMES_GALLERY_PAGE_TITLE };
+      IDS_NEW_TAB_WEBSTORE_PAGE_TITLE };
 
 namespace {
 
@@ -84,7 +84,7 @@ class LoadThumbnailsFromHistoryTask : public HistoryDBTask {
         result_count_(result_count) {
     // 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_THEMES_GALLERY_URL));
+    ignore_urls_.insert(l10n_util::GetStringUTF8(IDS_WEBSTORE_URL));
   }
 
   virtual bool RunOnDBThread(history::HistoryBackend* backend,
diff --git a/chrome/browser/resources/ntp4/tile_page.js b/chrome/browser/resources/ntp4/tile_page.js
index 4f6ecdb..c2dcaa5 100644
--- a/chrome/browser/resources/ntp4/tile_page.js
+++ b/chrome/browser/resources/ntp4/tile_page.js
@@ -390,6 +390,8 @@ cr.define('ntp4', function() {
       // Div that holds the tiles.
       this.tileGrid_ = this.ownerDocument.createElement('div');
       this.tileGrid_.className = 'tile-grid';
+      this.tileGrid_.style.minWidth = (this.gridValues_.minColCount *
+          this.gridValues_.minTileWidth) + 'px';
       this.content_.appendChild(this.tileGrid_);
 
       // Ordered list of our tiles.
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 0c456cd..0c8c5e6 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -2069,11 +2069,6 @@ void Browser::ShowHelpTab() {
   ShowSingletonTab(localized_help_url);
 }
 
-void Browser::OpenThemeGalleryTabAndActivate() {
-  AddSelectedTabWithURL(GURL(l10n_util::GetStringUTF8(IDS_THEMES_GALLERY_URL)),
-                        PageTransition::LINK);
-}
-
 void Browser::OpenPrivacyDashboardTabAndActivate() {
   OpenURL(GURL(kPrivacyDashboardUrl), GURL(),
           NEW_FOREGROUND_TAB, PageTransition::LINK);
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index da003f6..1466846 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -593,8 +593,6 @@ class Browser : public TabHandlerDelegate,
   void OpenAboutChromeDialog();
   void OpenUpdateChromeDialog();
   void ShowHelpTab();
-  // Used by the "Get themes" link in the options dialog.
-  void OpenThemeGalleryTabAndActivate();
   void OpenAutofillHelpTabAndActivate();
   void OpenPrivacyDashboardTabAndActivate();
   void OpenSearchEngineOptionsDialog();
diff --git a/chrome/browser/ui/webui/ntp/most_visited_handler.cc b/chrome/browser/ui/webui/ntp/most_visited_handler.cc
index 73a1363..25e0784 100644
--- a/chrome/browser/ui/webui/ntp/most_visited_handler.cc
+++ b/chrome/browser/ui/webui/ntp/most_visited_handler.cc
@@ -291,9 +291,9 @@ void MostVisitedHandler::SetPagesValueFromTopSites(
           "chrome://theme/IDR_NEWTAB_CHROME_WELCOME_PAGE_THUMBNAIL");
       page_value->SetString("faviconDominantColor", "rgb(0, 147, 60)");
     } else if (url.url.spec() ==
-               l10n_util::GetStringUTF8(IDS_THEMES_GALLERY_URL)) {
+               l10n_util::GetStringUTF8(IDS_WEBSTORE_URL)) {
       page_value->SetString("thumbnailUrl",
-          "chrome://theme/IDR_NEWTAB_THEMES_GALLERY_THUMBNAIL");
+          "chrome://theme/IDR_NEWTAB_WEBSTORE_THUMBNAIL");
       page_value->SetString("faviconDominantColor", "rgb(63, 132, 197)");
     }