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

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

Issue 164376: Merge 22613 - Apply theme to incognito NTP.... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 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 | Annotate | Revision Log
Property Changes:
Added: svn:mergeinfo
Merged /trunk/src/chrome/browser/resources/incognito_tab.html:r22613
Merged /branches/chrome_webkit_merge_branch/chrome/browser/resources/incognito_tab.html:r69-2775
OLDNEW
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 <html i18n-values="dir:textdirection"> 2 <html i18n-values="dir:textdirection;bookmarkbarattached:bookmarkbarattached">
3 <head> 3 <head>
4 <title i18n-content="title"></title> 4 <title i18n-content="title"></title>
5 <style> 5 <style>
6 body { 6 body {
7 margin:10px 8px 10px 8px; 7 margin:10px 8px 10px 8px;
8 } 8 }
9 .icon { 9 .icon {
10 float:right; 10 float:right;
11 margin:0px 6px 0px 3px; 11 margin:0px 6px 0px 3px;
12 } 12 }
13 .content { 13 .content {
14 -webkit-border-radius: 5px 5px; 14 -webkit-border-radius: 5px 5px;
15 background-color:#eee; 15 background-color:#eee;
16 color:black; 16 color:black;
17 padding:10px 10px 10px 10px; 17 padding:10px 10px 10px 10px;
18 max-width:600px; 18 max-width:600px;
19 margin-left:auto; 19 margin-left:auto;
20 margin-right:auto; 20 margin-right:auto;
21 } 21 }
22 </style> 22 </style>
23 <script>
24 // Until themes can clear the cache, force-reload the theme stylesheet.
25 document.write('<link id="incognitothemecss" rel="stylesheet" ' +
26 'href="chrome://theme/css/newincognitotab.css?' +
27 Date.now() + '">');
28 </script>
23 </head> 29 </head>
24 <body> 30 <body>
25 <div class="content" i18n-values=".style.fontFamily:fontfamily;.style.fontSize:f ontsize"> 31 <div class="content" i18n-values=".style.fontFamily:fontfamily;.style.fontSize:f ontsize">
26 <img src="../../app/theme/otr_icon_standalone.png" class="icon" /> 32 <img src="../../app/theme/otr_icon_standalone.png" class="icon" />
27 <span i18n-values=".innerHTML:content"></span> 33 <span i18n-values=".innerHTML:content"></span>
28 </div> 34 </div>
29 </body> 35 </body>
36 <script>
37 function themeChanged() {
38 document.getElementById('incognitothemecss').href =
39 'chrome://theme/css/newincognitotab.css?' + Date.now();
40 }
41
42 function bookmarkBarAttached() {
43 document.documentElement.setAttribute("bookmarkbarattached", "true");
44 }
45
46 function bookmarkBarDetached() {
47 document.documentElement.setAttribute("bookmarkbarattached", "false");
48 }
49 </script>
30 </html> 50 </html>
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/new_tab_ui.cc ('k') | chrome/browser/resources/new_incognito_tab_theme.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698