Chromium Code Reviews| 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..e5aa6c462504f10011bf8301d68609e40d564f66 100644 |
| --- a/chrome/browser/resources/ntp_search/new_tab.html |
| +++ b/chrome/browser/resources/ntp_search/new_tab.html |
| @@ -17,6 +17,15 @@ |
| <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/mockData.js"></script> |
| +--> |
| +<!-- Mock setup end --> |
| + |
| + |
| <!-- It's important that this be the first script loaded. --> |
| <script src="../ntp4/logging.js"></script> |
| @@ -27,16 +36,31 @@ |
| <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="../ntp4/suggestions_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 id="themecss" rel="stylesheet"> |
| +<link rel="stylesheet" href="new_tab.css"> |
| +<link rel="stylesheet" href="thumbnail_page.css"> |
| + |
| + |
| <script src="../shared/js/event_tracker.js"></script> |
| +<!-- |
| <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> |
| @@ -57,13 +81,24 @@ |
| <script src="../ntp4/tile_page.js"></script> |
| <script src="../ntp4/apps_page.js"></script> |
| <script src="../ntp4/dot_list.js"></script> |
| + |
| + |
| +<script src="./tile_page.js"></script> |
| +<script src="./thumbnail_page.js"></script> |
| +<script src="./most_visited_page.js"></script> |
| + |
| +<!-- |
|
Evan Stade
2012/08/07 21:57:12
if you're just going to comment things out without
pedrosimonetti2
2012/08/08 08:14:22
Done.
|
| <script src="../ntp4/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> |
| + |
|
Evan Stade
2012/08/07 21:57:12
newline why?
pedrosimonetti2
2012/08/08 08:14:22
Done.
|
| +<script src="./new_tab.js"></script> |
| + |
|
Evan Stade
2012/08/07 21:57:12
newline why?
pedrosimonetti2
2012/08/08 08:14:22
Done.
|
| <script src="../ntp4/recently_closed.js"></script> |
| <script src="../ntp4/other_sessions.js"></script> |
| </head> |
| @@ -86,6 +121,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 +142,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 +218,6 @@ |
| <div class="app-img-container"> |
| <img class="invisible"> |
| </div> |
| - <div class="color-stripe"></div> |
| </div> |
| <span class="title"></span> |
| </div> |