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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 <html i18n-values=" 2 <html i18n-values="
3 dir:textdirection; 3 dir:textdirection;
4 hasattribution:hasattribution; 4 hasattribution:hasattribution;
5 themegravity:themegravity; 5 themegravity:themegravity;
6 bookmarkbarattached:bookmarkbarattached;" 6 bookmarkbarattached:bookmarkbarattached;"
7 class="starting-up"> 7 class="starting-up">
8 <head> 8 <head>
9 <meta charset="utf-8"> 9 <meta charset="utf-8">
10 <title i18n-content="title"></title> 10 <title i18n-content="title"></title>
11 <!-- Don't scale the viewport in either portrait or landscape mode. 11 <!-- Don't scale the viewport in either portrait or landscape mode.
12 Note that this means apps will be reflowed when rotated (like iPad). 12 Note that this means apps will be reflowed when rotated (like iPad).
13 If we wanted to maintain position we could remove 'maximum-scale' so 13 If we wanted to maintain position we could remove 'maximum-scale' so
14 that we'd zoom out in portrait mode, but then there would be a bunch 14 that we'd zoom out in portrait mode, but then there would be a bunch
15 of unusable space at the bottom. 15 of unusable space at the bottom.
16 --> 16 -->
17 <meta name="viewport" 17 <meta name="viewport"
18 content="user-scalable=no, width=device-width, maximum-scale=1.0"> 18 content="user-scalable=no, width=device-width, maximum-scale=1.0">
19 19
20 <!-- Mock setup -->
21 <script src="../shared/js/load_time_data.js"></script>
22 <script src="mock/mock.js"></script>
23 <script src="mock/mock_data_autogen.js"></script>
24 <link rel="stylesheet" href="mock/debug.css">
25 <!-- Mock setup end -->
26
20 <!-- It's important that this be the first script loaded. --> 27 <!-- It's important that this be the first script loaded. -->
21 <script src="../ntp4/logging.js"></script> 28 <script src="../ntp4/logging.js"></script>
22 29
23 <link rel="stylesheet" href="../shared/css/bubble.css"> 30 <link rel="stylesheet" href="../shared/css/bubble.css">
24 <link rel="stylesheet" href="../shared/css/expandable_bubble.css"> 31 <link rel="stylesheet" href="../shared/css/expandable_bubble.css">
25 <link rel="stylesheet" href="../shared/css/menu.css"> 32 <link rel="stylesheet" href="../shared/css/menu.css">
26 <link rel="stylesheet" href="../shared/css/menu_button.css"> 33 <link rel="stylesheet" href="../shared/css/menu_button.css">
27 <link rel="stylesheet" href="../shared/css/trash.css"> 34 <link rel="stylesheet" href="../shared/css/trash.css">
28 <link rel="stylesheet" href="../shared/css/widgets.css"> 35 <link rel="stylesheet" href="../shared/css/widgets.css">
36
29 <link rel="stylesheet" href="../ntp4/apps_page.css"> 37 <link rel="stylesheet" href="../ntp4/apps_page.css">
30 <link rel="stylesheet" href="chrome://newtab/suggestions_page.css"> 38 <link rel="stylesheet" href="most_visited_page.css">
31 <link rel="stylesheet" href="../ntp4/most_visited_page.css">
32 <link rel="stylesheet" href="../ntp4/nav_dot.css"> 39 <link rel="stylesheet" href="../ntp4/nav_dot.css">
33 <link rel="stylesheet" href="../ntp4/new_tab.css"> 40 <link rel="stylesheet" href="../ntp4/new_tab.css">
34 <link rel="stylesheet" href="../ntp4/footer_menu.css"> 41 <link rel="stylesheet" href="new_tab.css">
35 <link rel="stylesheet" href="../ntp4/tile_page.css"> 42 <link rel="stylesheet" href="../ntp4/suggestions_page.css">
43 <link rel="stylesheet" href="thumbnail_page.css">
44 <link rel="stylesheet" href="tile_page.css">
45
36 <link id="themecss" rel="stylesheet"> 46 <link id="themecss" rel="stylesheet">
37 47
38 <script src="../shared/js/event_tracker.js"></script> 48 <script src="../shared/js/event_tracker.js"></script>
49 <!-- TODO(pedrosimonetti): we need to load this file before the mock script,
50 so we are temporarily commenting this out. We should remove once the NTP5
51 work is done.
39 <script src="../shared/js/load_time_data.js"></script> 52 <script src="../shared/js/load_time_data.js"></script>
53 -->
40 <script src="../shared/js/parse_html_subset.js"></script> 54 <script src="../shared/js/parse_html_subset.js"></script>
41 <script src="../shared/js/util.js"></script> 55 <script src="../shared/js/util.js"></script>
42
43 <script src="../shared/js/cr.js"></script> 56 <script src="../shared/js/cr.js"></script>
44 <script src="../shared/js/cr/ui.js"></script> 57 <script src="../shared/js/cr/ui.js"></script>
45 <script src="../shared/js/cr/ui/bubble.js"></script> 58 <script src="../shared/js/cr/ui/bubble.js"></script>
46 <script src="../shared/js/cr/ui/card_slider.js"></script> 59 <script src="../shared/js/cr/ui/card_slider.js"></script>
47 <script src="../shared/js/cr/ui/context_menu_handler.js"></script> 60 <script src="../shared/js/cr/ui/context_menu_handler.js"></script>
48 <script src="../shared/js/cr/ui/drag_wrapper.js"></script> 61 <script src="../shared/js/cr/ui/drag_wrapper.js"></script>
49 <script src="../shared/js/cr/ui/expandable_bubble.js"></script> 62 <script src="../shared/js/cr/ui/expandable_bubble.js"></script>
50 <script src="../shared/js/cr/ui/menu.js"></script> 63 <script src="../shared/js/cr/ui/menu.js"></script>
51 <script src="../shared/js/cr/ui/menu_item.js"></script> 64 <script src="../shared/js/cr/ui/menu_item.js"></script>
52 <script src="../shared/js/cr/ui/position_util.js"></script> 65 <script src="../shared/js/cr/ui/position_util.js"></script>
53 <script src="../shared/js/cr/ui/menu_button.js"></script> 66 <script src="../shared/js/cr/ui/menu_button.js"></script>
54 <script src="../shared/js/cr/ui/context_menu_button.js"></script> 67 <script src="../shared/js/cr/ui/context_menu_button.js"></script>
55 <script src="../shared/js/cr/ui/touch_handler.js"></script> 68 <script src="../shared/js/cr/ui/touch_handler.js"></script>
56 69
57 <script src="../ntp4/tile_page.js"></script> 70 <script src="../ntp4/tile_page.js"></script>
58 <script src="../ntp4/apps_page.js"></script> 71 <script src="../ntp4/apps_page.js"></script>
59 <script src="../ntp4/dot_list.js"></script> 72 <script src="../ntp4/dot_list.js"></script>
60 <script src="../ntp4/most_visited_page.js"></script> 73
74 <script src="tile_page.js"></script>
75 <script src="thumbnail_page.js"></script>
76 <script src="most_visited_page.js"></script>
61 <script src="../ntp4/trash.js"></script> 77 <script src="../ntp4/trash.js"></script>
62 <script src="../ntp4/page_list_view.js"></script> 78 <script src="../ntp4/page_list_view.js"></script>
63 <script src="../ntp4/page_switcher.js"></script> 79 <script src="../ntp4/page_switcher.js"></script>
64
65 <script src="../ntp4/nav_dot.js"></script> 80 <script src="../ntp4/nav_dot.js"></script>
66 <script src="../ntp4/new_tab.js"></script> 81 <script src="new_tab.js"></script>
67 <script src="../ntp4/recently_closed.js"></script> 82 <script src="../ntp4/recently_closed.js"></script>
68 <script src="../ntp4/other_sessions.js"></script> 83 <script src="../ntp4/other_sessions.js"></script>
69 </head> 84 </head>
70 85
71 <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize"> 86 <body id="ntp5"
87 i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
72 <button id="login-container" class="custom-appearance" hidden> 88 <button id="login-container" class="custom-appearance" hidden>
73 <div id="login-status-header-container" class="login-status-row"> 89 <div id="login-status-header-container" class="login-status-row">
74 <div id="login-status-header"></div> 90 <div id="login-status-header"></div>
75 </div> 91 </div>
76 <div id="login-status-sub-header"></div> 92 <div id="login-status-sub-header"></div>
77 </button> 93 </button>
78 94
79 <div id="notification-container" class="inactive" hidden> 95 <div id="notification-container" class="inactive" hidden>
80 <div id="notification"> 96 <div id="notification">
81 <span></span> 97 <span></span>
82 <div id="notificationLinks"></div> 98 <div id="notificationLinks"></div>
83 <button class="close-button custom-appearance" class="custom-appearance"> 99 <button class="close-button custom-appearance" class="custom-appearance">
84 </button> 100 </button>
85 </div> 101 </div>
86 </div> 102 </div>
87 103
88 <div id="card-slider-frame"> 104 <div id="card-slider-frame">
105 <div id="page-list-menu">
106 <ul id="dot-list"></ul>
107 </div>
89 <button id="page-switcher-start" class="page-switcher custom-appearance" 108 <button id="page-switcher-start" class="page-switcher custom-appearance"
90 tabindex="2" hidden>‹ 109 tabindex="2" hidden>‹
91 </button> 110 </button>
92 <div id="page-list"></div> 111 <div id="page-list"></div>
93 <button id="page-switcher-end" class="page-switcher custom-appearance" 112 <button id="page-switcher-end" class="page-switcher custom-appearance"
94 tabindex="2" hidden>› 113 tabindex="2" hidden>›
95 </button> 114 </button>
96 <div id="attribution"> 115 <div id="attribution">
97 <span i18n-content="attributionintro"></span> 116 <span i18n-content="attributionintro"></span>
98 <img id="attribution-img"> 117 <img id="attribution-img">
99 </div> 118 </div>
100 </div> 119 </div>
101 120
102 <div id="footer"> 121 <div id="footer">
103 <div id="footer-border"></div> 122 <div id="footer-border"></div>
104 <div id="footer-content"> 123 <div id="footer-content">
105 <img id="logo-img" src="chrome://theme/IDR_PRODUCT_LOGO"> 124 <img id="logo-img" src="chrome://theme/IDR_PRODUCT_LOGO">
106 125
107 <ul id="dot-list">
108 </ul>
109
110 <div class="menu-container"> 126 <div class="menu-container">
111 <button id="recently-closed-menu-button" 127 <button id="recently-closed-menu-button"
112 class="footer-menu-button custom-appearance"> 128 class="footer-menu-button custom-appearance">
113 <span i18n-content="recentlyclosed"></span> 129 <span i18n-content="recentlyclosed"></span>
114 <div class="disclosure-triangle"></div> 130 <div class="disclosure-triangle"></div>
115 </button> 131 </button>
116 132
117 <button id="other-sessions-menu-button" 133 <button id="other-sessions-menu-button"
118 class="footer-menu-button custom-appearance invisible"> 134 class="footer-menu-button custom-appearance invisible">
119 <span i18n-content="otherSessions"></span> 135 <span i18n-content="otherSessions"></span>
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 </div> 192 </div>
177 <span class="title"></span> 193 <span class="title"></span>
178 </div> 194 </div>
179 195
180 <!-- App Contents w/ Small Icon --> 196 <!-- App Contents w/ Small Icon -->
181 <div id="app-small-icon-template" class="app-contents"> 197 <div id="app-small-icon-template" class="app-contents">
182 <div class="app-icon-div"> 198 <div class="app-icon-div">
183 <div class="app-img-container"> 199 <div class="app-img-container">
184 <img class="invisible"> 200 <img class="invisible">
185 </div> 201 </div>
186 <div class="color-stripe"></div>
187 </div> 202 </div>
188 <span class="title"></span> 203 <span class="title"></span>
189 </div> 204 </div>
190 205
191 <!-- Message shown in the other sessions menu when the user is signed in but 206 <!-- Message shown in the other sessions menu when the user is signed in but
192 there is no session data (e.g. they have tab sync turned off). --> 207 there is no session data (e.g. they have tab sync turned off). -->
193 <div id="other-sessions-promo-template" class="other-sessions-promo-message"> 208 <div id="other-sessions-promo-template" class="other-sessions-promo-message">
194 <span i18n-content="otherSessionsEmpty"></span> 209 <span i18n-content="otherSessionsEmpty"></span>
195 <p> 210 <p>
196 <a i18n-values="href:otherSessionsLearnMoreUrl" i18n-content="learnMore"> 211 <a i18n-values="href:otherSessionsLearnMoreUrl" i18n-content="learnMore">
197 </a> 212 </a>
198 </p> 213 </p>
199 </div> 214 </div>
200 215
201 </div> 216 </div>
202 217
203 <!-- This is used to measure text in the current locale. It is not visible. --> 218 <!-- This is used to measure text in the current locale. It is not visible. -->
204 <div id="fontMeasuringDiv"></div> 219 <div id="fontMeasuringDiv"></div>
205 220
206 </html> 221 </html>
OLDNEW
« 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