Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2603)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/ntp_search/new_tab.html

Issue 10829131: Refactoring NTP5: new implementation of TilePage and MostVisitedPage (which now inherits from Thumb… (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Manually fixing mock_data_autogen.js lines with more than 80 chars. Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/ntp_search/new_tab.css ('k') | chrome/browser/resources/ntp_search/new_tab.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/ntp_search/new_tab.html
diff --git a/chrome/browser/resources/ntp_search/new_tab.html b/chrome/browser/resources/ntp_search/new_tab.html
index 48a395c71e64c8150a5e733b2188c4c947cbc6f7..9a248886dd340bd197cd1fd7a09b0bfe259b0abe 100644
--- a/chrome/browser/resources/ntp_search/new_tab.html
+++ b/chrome/browser/resources/ntp_search/new_tab.html
@@ -17,6 +17,13 @@
<meta name="viewport"
content="user-scalable=no, width=device-width, maximum-scale=1.0">
+<!-- Mock setup -->
+<script src="../shared/js/load_time_data.js"></script>
+<script src="mock/mock.js"></script>
+<script src="mock/mock_data_autogen.js"></script>
+<link rel="stylesheet" href="mock/debug.css">
+<!-- Mock setup end -->
+
<!-- It's important that this be the first script loaded. -->
<script src="../ntp4/logging.js"></script>
@@ -26,20 +33,26 @@
<link rel="stylesheet" href="../shared/css/menu_button.css">
<link rel="stylesheet" href="../shared/css/trash.css">
<link rel="stylesheet" href="../shared/css/widgets.css">
+
<link rel="stylesheet" href="../ntp4/apps_page.css">
-<link rel="stylesheet" href="chrome://newtab/suggestions_page.css">
-<link rel="stylesheet" href="../ntp4/most_visited_page.css">
+<link rel="stylesheet" href="most_visited_page.css">
<link rel="stylesheet" href="../ntp4/nav_dot.css">
<link rel="stylesheet" href="../ntp4/new_tab.css">
-<link rel="stylesheet" href="../ntp4/footer_menu.css">
-<link rel="stylesheet" href="../ntp4/tile_page.css">
+<link rel="stylesheet" href="new_tab.css">
+<link rel="stylesheet" href="../ntp4/suggestions_page.css">
+<link rel="stylesheet" href="thumbnail_page.css">
+<link rel="stylesheet" href="tile_page.css">
+
<link id="themecss" rel="stylesheet">
<script src="../shared/js/event_tracker.js"></script>
+<!-- TODO(pedrosimonetti): we need to load this file before the mock script,
+ so we are temporarily commenting this out. We should remove once the NTP5
+ work is done.
<script src="../shared/js/load_time_data.js"></script>
+-->
<script src="../shared/js/parse_html_subset.js"></script>
<script src="../shared/js/util.js"></script>
-
<script src="../shared/js/cr.js"></script>
<script src="../shared/js/cr/ui.js"></script>
<script src="../shared/js/cr/ui/bubble.js"></script>
@@ -57,18 +70,21 @@
<script src="../ntp4/tile_page.js"></script>
<script src="../ntp4/apps_page.js"></script>
<script src="../ntp4/dot_list.js"></script>
-<script src="../ntp4/most_visited_page.js"></script>
+
+<script src="tile_page.js"></script>
+<script src="thumbnail_page.js"></script>
+<script src="most_visited_page.js"></script>
<script src="../ntp4/trash.js"></script>
<script src="../ntp4/page_list_view.js"></script>
<script src="../ntp4/page_switcher.js"></script>
-
<script src="../ntp4/nav_dot.js"></script>
-<script src="../ntp4/new_tab.js"></script>
+<script src="new_tab.js"></script>
<script src="../ntp4/recently_closed.js"></script>
<script src="../ntp4/other_sessions.js"></script>
</head>
-<body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
+<body id="ntp5"
+ i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
<button id="login-container" class="custom-appearance" hidden>
<div id="login-status-header-container" class="login-status-row">
<div id="login-status-header"></div>
@@ -86,6 +102,9 @@
</div>
<div id="card-slider-frame">
+ <div id="page-list-menu">
+ <ul id="dot-list"></ul>
+ </div>
<button id="page-switcher-start" class="page-switcher custom-appearance"
tabindex="2" hidden>‹
</button>
@@ -104,9 +123,6 @@
<div id="footer-content">
<img id="logo-img" src="chrome://theme/IDR_PRODUCT_LOGO">
- <ul id="dot-list">
- </ul>
-
<div class="menu-container">
<button id="recently-closed-menu-button"
class="footer-menu-button custom-appearance">
@@ -183,7 +199,6 @@
<div class="app-img-container">
<img class="invisible">
</div>
- <div class="color-stripe"></div>
</div>
<span class="title"></span>
</div>
« no previous file with comments | « chrome/browser/resources/ntp_search/new_tab.css ('k') | chrome/browser/resources/ntp_search/new_tab.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698