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

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

Issue 13568003: History: Fix position of lock/unlock button (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 8 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/resources/history/history.css ('k') | no next file » | 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="dir:textdirection;"> 2 <html i18n-values="dir:textdirection;">
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 <if expr="pp_ifdef('android') or pp_ifdef('ios')"> 5 <if expr="pp_ifdef('android') or pp_ifdef('ios')">
6 <meta name="viewport" content="width=device-width, initial-scale=1.0, 6 <meta name="viewport" content="width=device-width, initial-scale=1.0,
7 maximum-scale=1.0, user-scalable=no"> 7 maximum-scale=1.0, user-scalable=no">
8 </if> 8 </if>
9 <title i18n-content="title"></title> 9 <title i18n-content="title"></title>
10 <link rel="stylesheet" href="chrome://resources/css/butter_bar.css"> 10 <link rel="stylesheet" href="chrome://resources/css/butter_bar.css">
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 <span i18n-content="groupByDomainLabel"></span> 78 <span i18n-content="groupByDomainLabel"></span>
79 </label> 79 </label>
80 <label> 80 <label>
81 <span i18n-content="rangeLabel"></span> 81 <span i18n-content="rangeLabel"></span>
82 <select id="timeframe-filter"> 82 <select id="timeframe-filter">
83 <option i18n-content="rangeAllTime" value="0"></option> 83 <option i18n-content="rangeAllTime" value="0"></option>
84 <option i18n-content="rangeWeek" value="1"></option> 84 <option i18n-content="rangeWeek" value="1"></option>
85 <option i18n-content="rangeMonth" value="2"></option> 85 <option i18n-content="rangeMonth" value="2"></option>
86 </select> 86 </select>
87 </label> 87 </label>
88 <button id="lock-unlock-button" i18n-content="unlockButton"></button>
88 </div> 89 </div>
89 </div> 90 </div>
90 <if expr="not pp_ifdef('android')"> 91 <if expr="not pp_ifdef('android')">
91 <div id="other-devices" class="other-devices"></div> 92 <div id="other-devices" class="other-devices"></div>
92 </if> 93 </if>
93 <div id="top-container"> 94 <div id="top-container">
94 <div id="editing-controls"> 95 <div id="editing-controls">
95 <button id="clear-browsing-data" i18n-content="clearAllHistory"></button> 96 <button id="clear-browsing-data" i18n-content="clearAllHistory"></button>
96 <button id="remove-selected" disabled="disabled" 97 <button id="remove-selected" disabled="disabled"
97 i18n-content="removeSelected"></button> 98 i18n-content="removeSelected"></button>
98 <button id="allow-selected" i18n-content="allowItems" disabled="disabled" 99 <button id="allow-selected" i18n-content="allowItems" disabled="disabled"
99 hidden> 100 hidden>
100 </button> 101 </button>
101 <button id="block-selected" i18n-content="blockItems" disabled="disabled" 102 <button id="block-selected" i18n-content="blockItems" disabled="disabled"
102 hidden> 103 hidden>
103 </button> 104 </button>
104 <button id="lock-unlock-button" i18n-content="unlockButton"></button>
105 </div> 105 </div>
106 <div id="notification-bar" hidden></div> 106 <div id="notification-bar" hidden></div>
107 </div> 107 </div>
108 108
109 <div id="results-display"></div> 109 <div id="results-display"></div>
110 <div id="loading-spinner" hidden> 110 <div id="loading-spinner" hidden>
111 <span id="loading"> 111 <span id="loading">
112 <div id="spinner" class="inline-spinner"></div> 112 <div id="spinner" class="inline-spinner"></div>
113 <span i18n-content="loading"></span> 113 <span i18n-content="loading"></span>
114 </span> 114 </span>
(...skipping 11 matching lines...) Expand all
126 126
127 <menu id="action-menu"> 127 <menu id="action-menu">
128 <button id="more-from-site" i18n-content="moreFromSite"></button> 128 <button id="more-from-site" i18n-content="moreFromSite"></button>
129 <button id="remove-visit" i18n-content="removeFromHistory"></button> 129 <button id="remove-visit" i18n-content="removeFromHistory"></button>
130 </menu> 130 </menu>
131 131
132 <script src="chrome://history-frame/strings.js"></script> 132 <script src="chrome://history-frame/strings.js"></script>
133 <script src="chrome://resources/js/i18n_template2.js"></script> 133 <script src="chrome://resources/js/i18n_template2.js"></script>
134 </body> 134 </body>
135 </html> 135 </html>
OLDNEW
« no previous file with comments | « chrome/browser/resources/history/history.css ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698