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

Side by Side Diff: chrome/browser/resources/new_new_tab.html

Issue 6183005: Merge 69758 - Do not show apps section until default apps are installed.... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/597/src/
Patch Set: Created 9 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/extensions/default_apps.h ('k') | chrome/browser/resources/ntp/apps.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 bookmarkbarattached:bookmarkbarattached; 4 bookmarkbarattached:bookmarkbarattached;
5 hasattribution:hasattribution; 5 hasattribution:hasattribution;
6 anim:anim; 6 anim:anim;
7 syncispresent:syncispresent; 7 syncispresent:syncispresent;
8 customlogo:customlogo" 8 customlogo:customlogo"
9 install-animation-enabled="true"> 9 install-animation-enabled="true">
10 <head> 10 <head>
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 <button id="apps-promo-hide" i18n-content="appspromohide"></button> 144 <button id="apps-promo-hide" i18n-content="appspromohide"></button>
145 <h3 i18n-content="appspromoheader"></h3> 145 <h3 i18n-content="appspromoheader"></h3>
146 <p id="apps-promo-text1" i18n-content="appspromotext1"></p> 146 <p id="apps-promo-text1" i18n-content="appspromotext1"></p>
147 <p id="apps-promo-text2" i18n-content="appspromotext2"></p> 147 <p id="apps-promo-text2" i18n-content="appspromotext2"></p>
148 </div> 148 </div>
149 <div id="apps-content"></div> 149 <div id="apps-content"></div>
150 </div> 150 </div>
151 <div class="maxiview" id="most-visited-maxiview"></div> 151 <div class="maxiview" id="most-visited-maxiview"></div>
152 152
153 <div class="sections"> 153 <div class="sections">
154 <!-- Start disabled. We only enable if we have at least one app. --> 154 <!-- Start disabled. We only enable once we have installed default apps. -->
155 <div id="apps" class="section disabled" section="APPS"> 155 <div id="apps" class="section disabled" section="APPS">
156 <h2> 156 <h2>
157 <img class="disclosure" img src="ntp/ntp_disclosure_triangle.png"> 157 <img class="disclosure" img src="ntp/ntp_disclosure_triangle.png">
158 <div class="back"></div> 158 <div class="back"></div>
159 <span i18n-content="apps"></span> 159 <span i18n-content="apps"></span>
160 <button class="section-close-button"></button> 160 <button class="section-close-button"></button>
161 </h2> 161 </h2>
162 <div class="miniview"></div> 162 <div class="miniview"></div>
163 </div> 163 </div>
164 164
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 // all three sections to update. 312 // all three sections to update.
313 shownSections &= ~MINIMIZED_THUMB; 313 shownSections &= ~MINIMIZED_THUMB;
314 shownSections |= MINIMIZED_APPS | MINIMIZED_RECENT; 314 shownSections |= MINIMIZED_APPS | MINIMIZED_RECENT;
315 setSectionVisible('apps', Section.APPS, appsInitiallyVisible, MINIMIZED_APPS); 315 setSectionVisible('apps', Section.APPS, appsInitiallyVisible, MINIMIZED_APPS);
316 setSectionVisible( 316 setSectionVisible(
317 'most-visited', Section.THUMB, 317 'most-visited', Section.THUMB,
318 mostVisitedInitiallyVisible, MINIMIZED_THUMB); 318 mostVisitedInitiallyVisible, MINIMIZED_THUMB);
319 setSectionVisible( 319 setSectionVisible(
320 'recently-closed', undefined, 320 'recently-closed', undefined,
321 recentlyClosedInitiallyVisible, MINIMIZED_RECENT); 321 recentlyClosedInitiallyVisible, MINIMIZED_RECENT);
322
323 // This is insane, but we use the CSS class 'disabled' for both 'minimized'
324 // sections and sections that are actually disabled, as in not accessible in
325 // any way.
326 //
327 // The above code syncs up the DOM and shownSection wrt minimized. But we
328 // don't know until we receive the apps data whether the apps section will be
329 // disabled or not. So we need to add the 'disabled' class back to the apps
330 // section here. We remove it later, once we know for sure we want it to be
331 // enabled.
332 //
333 // See also: crbug.com/67273.
334 $('apps').classList.add('disabled');
335
322 layoutSections(); 336 layoutSections();
323 </script> 337 </script>
324 </html> 338 </html>
OLDNEW
« no previous file with comments | « chrome/browser/extensions/default_apps.h ('k') | chrome/browser/resources/ntp/apps.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698