chrome/browser/resources/options2/options.html - Issue 9091015: [uber page] Convert 'Under the Hood' page to a sub-page.

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

Issue 9091015: [uber page] Convert 'Under the Hood' page to a sub-page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: tweak Created 8 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

« chrome/browser/resources/options2/browser_options.html ('K') | « chrome/browser/resources/options2/browser_options.js ('k') | chrome/browser/resources/options2/options.js » ('j') | chrome/browser/resources/options2/options_page.css » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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	6

7 <link rel="icon" href="../../../app/theme/settings_favicon.png">	7 <link rel="icon" href="../../../app/theme/settings_favicon.png">

8 <link rel="stylesheet" href="chrome://resources/css/button.css">	8 <link rel="stylesheet" href="chrome://resources/css/button.css">

9 <link rel="stylesheet" href="chrome://resources/css/checkbox.css">	9 <link rel="stylesheet" href="chrome://resources/css/checkbox.css">

10 <link rel="stylesheet" href="chrome://resources/css/list.css">	10 <link rel="stylesheet" href="chrome://resources/css/list.css">

(...skipping 103 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
114 <!-- Please keep the main pages in desired order of display. This will	114 <!-- Please keep the main pages in desired order of display. This will

115 allow search results to display in the desired order. -->	115 allow search results to display in the desired order. -->

116 <include src="search_page.html">	116 <include src="search_page.html">

117 <include src="browser_options.html">	117 <include src="browser_options.html">

118 <include src="personal_options.html">	118 <include src="personal_options.html">

119 <if expr="pp_ifdef('chromeos')">	119 <if expr="pp_ifdef('chromeos')">

120 <include src="chromeos/system_options.html">	120 <include src="chromeos/system_options.html">

121 <include src="chromeos/internet_options.html">	121 <include src="chromeos/internet_options.html">

122 <include src="chromeos/accounts_options.html">	122 <include src="chromeos/accounts_options.html">

123 </if>	123 </if>

124 <include src="advanced_options.html">

125 </div>	124 </div>

126 <div id="subpage-sheet-container-1"	125 <div id="subpage-sheet-container-1"

127 class="subpage-sheet-container transparent" hidden>	126 class="subpage-sheet-container transparent" hidden>

128 <div id="subpage-sheet-1" class="subpage-sheet">	127 <div id="subpage-sheet-1" class="subpage-sheet">

129 <button class="raw-button close-subpage custom-appearance"></button>	128 <button class="raw-button close-subpage custom-appearance"></button>

130 <div class="subpage-sheet-contents">	129 <div class="subpage-sheet-contents">

	130 <include src="search_engine_manager.html">

	131 <include src="advanced_options.html">

	132 </div>

	133 </div>

	134 </div>

	135 <div id="subpage-sheet-container-2"

	136 class="subpage-sheet-container transparent" hidden>

	137 <div id="subpage-sheet-2" class="subpage-sheet">

	138 <button class="raw-button close-subpage custom-appearance"></button>

	139 <div class="subpage-sheet-contents">

131 <if expr="pp_ifdef('chromeos')">	140 <if expr="pp_ifdef('chromeos')">

132 <include src="about_page.html">
James Hawkins 2012/01/04 23:34:30 Where do these go now? Where do these go now? csilv 2012/01/04 23:48:23 These pages are not accessible in options2, so I'l Show quoted text On 2012/01/04 23:34:30, James Hawkins wrote: > Where do these go now? These pages are not accessible in options2, so I'll revert the change for simplicity. 'About' is a top-level page so it has to come out of settings and be moved into a new page. (I'll file a bug). I don't know about the picture since it's not included Glen's specs. I'll ask for clarification. James Hawkins 2012/01/04 23:54:35 Thanks! Show quoted text On 2012/01/04 23:48:23, csilv wrote: > On 2012/01/04 23:34:30, James Hawkins wrote: > > Where do these go now? > > These pages are not accessible in options2, so I'll revert the change for > simplicity. 'About' is a top-level page so it has to come out of settings and > be moved into a new page. (I'll file a bug). > > I don't know about the picture since it's not included Glen's specs. I'll ask > for clarification. Thanks!
133 <include src="chromeos/change_picture_options.html">

134 <include src="chromeos/proxy.html">	141 <include src="chromeos/proxy.html">

135 </if>	142 </if>

136 <if expr="not pp_ifdef('win32') and not pp_ifdef('darwin')">	143 <if expr="not pp_ifdef('win32') and not pp_ifdef('darwin')">

137 <include src="certificate_manager.html">	144 <include src="certificate_manager.html">

138 </if>	145 </if>

139 <include src="autofill_options.html">	146 <include src="autofill_options.html">

140 <include src="content_settings.html">	147 <include src="content_settings.html">

141 <include src="font_settings.html">	148 <include src="font_settings.html">

142 <include src="language_options.html">	149 <include src="language_options.html">

143 <include src="password_manager.html">	150 <include src="password_manager.html">

144 <include src="search_engine_manager.html">

145 </div>	151 </div>

146 </div>	152 </div>

147 </div>	153 </div>

148 <div id="subpage-sheet-container-2"	154 <div id="subpage-sheet-container-3"

149 class="subpage-sheet-container transparent" hidden>	155 class="subpage-sheet-container transparent" hidden>

150 <div id="subpage-sheet-2" class="subpage-sheet">	156 <div id="subpage-sheet-3" class="subpage-sheet">

151 <button class="raw-button close-subpage custom-appearance"></button>	157 <button class="raw-button close-subpage custom-appearance"></button>

152 <div class="subpage-sheet-contents">	158 <div class="subpage-sheet-contents">

153 <if expr="pp_ifdef('chromeos')">	159 <if expr="pp_ifdef('chromeos')">

154 <include src="chromeos/language_chewing_options.html">	160 <include src="chromeos/language_chewing_options.html">

155 <include src="chromeos/language_hangul_options.html">	161 <include src="chromeos/language_hangul_options.html">

156 <include src="chromeos/language_mozc_options.html">	162 <include src="chromeos/language_mozc_options.html">

157 <include src="chromeos/language_pinyin_options.html">	163 <include src="chromeos/language_pinyin_options.html">

158 </if>	164 </if>

159 <if expr="pp_ifdef('chromeos') and pp_ifdef('use_virtual_keyboard') ">	165 <if expr="pp_ifdef('chromeos') and pp_ifdef('use_virtual_keyboard') ">

160 <include src="chromeos/virtual_keyboard.html">	166 <include src="chromeos/virtual_keyboard.html">

(...skipping 10 matching lines...) Expand all Loading...
171 </div>	177 </div>

172 </div>	178 </div>

173 </div>	179 </div>

174 </div>	180 </div>

175 </div>	181 </div>

176 <script src="chrome://settings-frame/strings.js"></script>	182 <script src="chrome://settings-frame/strings.js"></script>

177 <script src="chrome://resources/js/i18n_template.js"></script>	183 <script src="chrome://resources/js/i18n_template.js"></script>

178 <script src="chrome://resources/js/i18n_process.js"></script>	184 <script src="chrome://resources/js/i18n_process.js"></script>

179 </body>	185 </body>

180 </html>	186 </html>

OLD	NEW