summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-12 22:17:26 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-12 22:17:26 +0000
commitc0d08e0a834e0b9e8c3a367452708f8f1624f721 (patch)
treedb1ba71d6f77c6cdf8778ab3c85e4e01ace8a073 /chrome/browser/resources
parenta5545a2c04a692492362da278c2c0b6215d22f48 (diff)
downloadchromium_src-c0d08e0a834e0b9e8c3a367452708f8f1624f721.zip
chromium_src-c0d08e0a834e0b9e8c3a367452708f8f1624f721.tar.gz
chromium_src-c0d08e0a834e0b9e8c3a367452708f8f1624f721.tar.bz2
Resource cleanup and de-duping
- remove duplicate code between most_visited_handler.cc and top_sites.cc - remove dead code in most_visited_handler.cc - remove duplicate favicon resources - update favicon resources by adding 32x32s resource for NTP stock most visited pages - uniformly refer to PRODUCT_NAME rather than sometimes using "google chrome" in chromium builds on the NTP - consolidate some resources (IDR_CHROME_STORE_PAGE_FAVICON and IDR_WESBTORE_ICON_16 for example) - remove unused thumbnail for webstore (which is slightly distinct from the themes gallery because there's no &category=theme in the URL) as a precursor, I had to add an icon to chrome/app/theme/google_chrome (internal repository) as a cleanup after, I will have to remove an icon from the same BUG=none TEST=trybots; manual Review URL: http://codereview.chromium.org/7342001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92249 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
-rw-r--r--chrome/browser/resources/new_tab.js2
-rw-r--r--chrome/browser/resources/ntp/most_visited.js2
-rw-r--r--chrome/browser/resources/ntp4/most_visited_page.js1
-rw-r--r--chrome/browser/resources/ntp4/new_tab.js2
4 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/resources/new_tab.js b/chrome/browser/resources/new_tab.js
index 148dcb1..849e16d 100644
--- a/chrome/browser/resources/new_tab.js
+++ b/chrome/browser/resources/new_tab.js
@@ -1438,7 +1438,7 @@ var mostVisited = new MostVisited(
useSmallGrid(),
shownSections & Section.THUMB);
-function setMostVisitedPages(data, firstRun, hasBlacklistedUrls) {
+function setMostVisitedPages(data, hasBlacklistedUrls) {
logEvent('received most visited pages');
mostVisited.updateSettingsLink(hasBlacklistedUrls);
diff --git a/chrome/browser/resources/ntp/most_visited.js b/chrome/browser/resources/ntp/most_visited.js
index 0978f8c..f19d8cf 100644
--- a/chrome/browser/resources/ntp/most_visited.js
+++ b/chrome/browser/resources/ntp/most_visited.js
@@ -136,7 +136,7 @@ var MostVisited = (function() {
// Send 'getMostVisitedPages' with a callback since we want to find the
// new page and add that in the place of the removed page.
chromeSend('getMostVisited', [], 'setMostVisitedPages',
- function(data, firstRun, hasBlacklistedUrls) {
+ function(data, hasBlacklistedUrls) {
// Update settings link.
self.updateSettingsLink(hasBlacklistedUrls);
diff --git a/chrome/browser/resources/ntp4/most_visited_page.js b/chrome/browser/resources/ntp4/most_visited_page.js
index 4e89c12..d88770c 100644
--- a/chrome/browser/resources/ntp4/most_visited_page.js
+++ b/chrome/browser/resources/ntp4/most_visited_page.js
@@ -224,7 +224,6 @@ cr.define('ntp4', function() {
initialize: function() {
this.classList.add('most-visited-page');
-
this.data_ = null;
this.mostVisitedTiles_ = this.getElementsByClassName('most-visited real');
},
diff --git a/chrome/browser/resources/ntp4/new_tab.js b/chrome/browser/resources/ntp4/new_tab.js
index 7a6c920..f6dc354 100644
--- a/chrome/browser/resources/ntp4/new_tab.js
+++ b/chrome/browser/resources/ntp4/new_tab.js
@@ -547,7 +547,7 @@ cr.define('ntp4', function() {
$('recently-closed-menu-button').dataItems = dataItems;
}
- function setMostVisitedPages(data, firstRun, hasBlacklistedUrls) {
+ function setMostVisitedPages(data, hasBlacklistedUrls) {
mostVisitedPage.data = data;
}