summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-18 22:43:08 +0000
committerarv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-18 22:43:08 +0000
commitfa7dc4a4c0db87b3eb0e0a79e0b02c7afecfe660 (patch)
treea42e5966f75cc1ea856b857c0ff41776cb61ca2a
parent5a3b61488b8a7e5a175f8519ea15edcdcf2bd502 (diff)
downloadchromium_src-fa7dc4a4c0db87b3eb0e0a79e0b02c7afecfe660.zip
chromium_src-fa7dc4a4c0db87b3eb0e0a79e0b02c7afecfe660.tar.gz
chromium_src-fa7dc4a4c0db87b3eb0e0a79e0b02c7afecfe660.tar.bz2
WebUI: Rename new_new_tab to new_tab
BUG=None TEST=None Review URL: http://codereview.chromium.org/7043014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85829 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/browser_resources.grd4
-rw-r--r--chrome/browser/resources/new_tab.css (renamed from chrome/browser/resources/new_new_tab.css)0
-rw-r--r--chrome/browser/resources/new_tab.html (renamed from chrome/browser/resources/new_new_tab.html)4
-rw-r--r--chrome/browser/resources/new_tab.js (renamed from chrome/browser/resources/new_new_tab.js)2
-rw-r--r--chrome/browser/resources/new_tab_theme.css (renamed from chrome/browser/resources/new_new_tab_theme.css)0
-rw-r--r--chrome/browser/resources/options/language_options.css2
-rw-r--r--chrome/browser/resources/options/language_options.js2
-rw-r--r--chrome/browser/sync/resources/gaia_login.js2
8 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index 253f49a..d97e590 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -46,8 +46,8 @@
<include name="IDR_GPU_BLACKLIST" file="resources\software_rendering_list.json" type="BINDATA" />
<include name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_incognito_tab_theme.css" flattenhtml="true" type="BINDATA" />
<if expr="not pp_ifdef('touchui')">
- <include name="IDR_NEW_TAB_HTML" file="resources\new_new_tab.html" flattenhtml="true" type="BINDATA" />
- <include name="IDR_NEW_TAB_THEME_CSS" file="resources\new_new_tab_theme.css" flattenhtml="true" type="BINDATA" />
+ <include name="IDR_NEW_TAB_HTML" file="resources\new_tab.html" flattenhtml="true" type="BINDATA" />
+ <include name="IDR_NEW_TAB_THEME_CSS" file="resources\new_tab_theme.css" flattenhtml="true" type="BINDATA" />
</if>
<if expr="pp_ifdef('touchui')">
<include name="IDR_NEW_TAB_HTML" file="resources\touch_ntp\newtab.html" flattenhtml="true" type="BINDATA" />
diff --git a/chrome/browser/resources/new_new_tab.css b/chrome/browser/resources/new_tab.css
index 5273492..5273492 100644
--- a/chrome/browser/resources/new_new_tab.css
+++ b/chrome/browser/resources/new_tab.css
diff --git a/chrome/browser/resources/new_new_tab.html b/chrome/browser/resources/new_tab.html
index c6d0751..609bb33 100644
--- a/chrome/browser/resources/new_new_tab.html
+++ b/chrome/browser/resources/new_tab.html
@@ -58,7 +58,7 @@ chrome.send('getApps');
</script>
<!-- template data placeholder -->
-<link rel="stylesheet" href="new_new_tab.css">
+<link rel="stylesheet" href="new_tab.css">
<link rel="stylesheet" href="ntp/most_visited.css">
<link rel="stylesheet" href="ntp/apps.css">
<link rel="stylesheet" href="shared/css/menu.css">
@@ -290,7 +290,7 @@ i18nTemplate.process(document, templateData);
<script src="ntp/drag_drop_controller.js"></script>
<script src="ntp/most_visited.js"></script>
-<script src="new_new_tab.js"></script>
+<script src="new_tab.js"></script>
<script src="ntp/apps.js"></script>
<script>
diff --git a/chrome/browser/resources/new_new_tab.js b/chrome/browser/resources/new_tab.js
index b745cf0..c0f722b 100644
--- a/chrome/browser/resources/new_new_tab.js
+++ b/chrome/browser/resources/new_tab.js
@@ -913,7 +913,7 @@ function updateAttributionDisplay(contentBottom) {
var contentRect = main.getBoundingClientRect();
var attributionRect = attribution.getBoundingClientRect();
- // Hack. See comments for '.haslayout' in new_new_tab.css.
+ // Hack. See comments for '.haslayout' in new_tab.css.
if (attributionRect.width == 0)
return;
else
diff --git a/chrome/browser/resources/new_new_tab_theme.css b/chrome/browser/resources/new_tab_theme.css
index 682cf16..682cf16 100644
--- a/chrome/browser/resources/new_new_tab_theme.css
+++ b/chrome/browser/resources/new_tab_theme.css
diff --git a/chrome/browser/resources/options/language_options.css b/chrome/browser/resources/options/language_options.css
index 30ede75..03a2a3f 100644
--- a/chrome/browser/resources/options/language_options.css
+++ b/chrome/browser/resources/options/language_options.css
@@ -137,7 +137,7 @@ html[os=chromeos] #add-language-overlay-page ul {
margin: 0;
}
-/* TODO(kochi): This is temporary copy from new_new_tab.css */
+/* TODO(kochi): This is temporary copy from new_tab.css */
/* Notification */
#notification {
diff --git a/chrome/browser/resources/options/language_options.js b/chrome/browser/resources/options/language_options.js
index 32528d1..0706286 100644
--- a/chrome/browser/resources/options/language_options.js
+++ b/chrome/browser/resources/options/language_options.js
@@ -701,7 +701,7 @@ cr.define('options', function() {
return filteredPreloadEngines;
},
- // TODO(kochi): This is an adapted copy from new_new_tab.js.
+ // TODO(kochi): This is an adapted copy from new_tab.js.
// If this will go as final UI, refactor this to share the component with
// new new tab page.
/**
diff --git a/chrome/browser/sync/resources/gaia_login.js b/chrome/browser/sync/resources/gaia_login.js
index f19dd29..726dc4f 100644
--- a/chrome/browser/sync/resources/gaia_login.js
+++ b/chrome/browser/sync/resources/gaia_login.js
@@ -10,7 +10,7 @@
// account" link.
var g_is_captcha_challenge_active = false;
-// Taken from new_new_tab.js.
+// Taken from new_tab.js.
// TODO(tim): Can this be unified?
function url(s) {
// http://www.w3.org/TR/css3-values/#uris