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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/resources/options2/options.html

Issue 9513016: uber managed pref banners (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed merge Created 8 years, 9 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/options2/content_settings.js ('k') | chrome/browser/resources/options2/options_page.css » ('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 id="t" i18n-values="dir:textdirection"> 2 <html id="t" i18n-values="dir:textdirection">
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 <title i18n-content="optionsPageTitle"></title> 5 <title i18n-content="optionsPageTitle"></title>
6 <link rel="icon" href="chrome://theme/IDR_SETTINGS_FAVICON"> 6 <link rel="icon" href="chrome://theme/IDR_SETTINGS_FAVICON">
7 <link rel="stylesheet" href="chrome://resources/css/list.css"> 7 <link rel="stylesheet" href="chrome://resources/css/list.css">
8 <link rel="stylesheet" href="chrome://resources/css/overlay.css"> 8 <link rel="stylesheet" href="chrome://resources/css/overlay.css">
9 <link rel="stylesheet" href="chrome://resources/css/select.css"> 9 <link rel="stylesheet" href="chrome://resources/css/select.css">
10 <link rel="stylesheet" href="chrome://resources/css/spinner.css"> 10 <link rel="stylesheet" href="chrome://resources/css/spinner.css">
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 </if> 132 </if>
133 </div> 133 </div>
134 <div id="overlay-container-3" class="overlay transparent" hidden> 134 <div id="overlay-container-3" class="overlay transparent" hidden>
135 <if expr="pp_ifdef('chromeos')"> 135 <if expr="pp_ifdef('chromeos')">
136 <include src="chromeos/proxy.html"> 136 <include src="chromeos/proxy.html">
137 </if> 137 </if>
138 </div> 138 </div>
139 139
140 <div id="main-content"> 140 <div id="main-content">
141 <div id="mainview"> 141 <div id="mainview">
142 <div id="managed-prefs-banner" class="managed-prefs-banner" hidden> 142 <!-- TODO(csilv): Remove subpage-backdrop -->
143 <span id="managed-prefs-icon" class="managed-prefs-icon"></span> 143 <div id="subpage-backdrop" hidden></div>
144 <span id="managed-prefs-text" class="managed-prefs-text"></span> 144 <div id="mainview-content">
145 </div> 145 <div id="page-container">
146 <!-- TODO(csilv): Remove subpage-backdrop --> 146 <!-- Please keep the main pages in desired order of display. This will
147 <div id="subpage-backdrop" hidden></div> 147 allow search results to display in the desired order. -->
148 <div id="mainview-content"> 148 <include src="search_page.html">
149 <div id="page-container"> 149 <include src="browser_options.html">
150 <include src="search_page.html"> 150 </div>
151 <include src="browser_options.html"> 151 <!-- TODO(csilv): Remove subpage-sheet-container-1 -->
152 </div> 152 <div id="subpage-sheet-container-1"
153 <!-- TODO(csilv): Remove subpage-sheet-container-1 --> 153 class="subpage-sheet-container transparent" hidden>
154 <div id="subpage-sheet-container-1" 154 <div id="subpage-sheet-1" class="subpage-sheet">
155 class="subpage-sheet-container transparent" hidden> 155 <div class="subpage-sheet-contents">
156 </div> 156 <include src="advanced_options.html">
157 </div> 157 </div>
158 </div>
159 </div>
160 </div>
158 </div> 161 </div>
159 </div> 162 </div>
163
164 <div id="templates" hidden>
165 <div id="managed-prefs-banner" class="managed-prefs-banner">
166 <div class="managed-prefs-gradient">
167 <span id="managed-prefs-text" class="managed-prefs-text"></span>
168 </div>
169 </div>
170 </div>
171
160 <script src="chrome://settings-frame/strings.js"></script> 172 <script src="chrome://settings-frame/strings.js"></script>
161 <script src="chrome://resources/js/i18n_template.js"></script> 173 <script src="chrome://resources/js/i18n_template.js"></script>
162 <script src="chrome://resources/js/i18n_process.js"></script> 174 <script src="chrome://resources/js/i18n_process.js"></script>
163 </body> 175 </body>
164 </html> 176 </html>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options2/content_settings.js ('k') | chrome/browser/resources/options2/options_page.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698