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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 7719029: Revert 97966 : Revert 97955 - First pass on intents options UI. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Merge head Created 9 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
« no previous file with comments | « chrome/browser/resources/options/intents_view.js ('k') | chrome/browser/resources/options/options.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 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 <include src="../content_security_policy.html"/> 5 <include src="../content_security_policy.html"/>
6 <!-- Set the title to that of the default page so that the title doesn't flash 6 <!-- Set the title to that of the default page so that the title doesn't flash
7 on load (for the most common case). --> 7 on load (for the most common case). -->
8 <title i18n-content="browserPageTabTitle"></title> 8 <title i18n-content="browserPageTabTitle"></title>
9 9
10 <link rel="icon" href="../../../app/theme/settings_favicon.png"> 10 <link rel="icon" href="../../../app/theme/settings_favicon.png">
(...skipping 11 matching lines...) Expand all
22 <link rel="stylesheet" href="autofill_overlay.css"> 22 <link rel="stylesheet" href="autofill_overlay.css">
23 <link rel="stylesheet" href="browser_options_page.css"> 23 <link rel="stylesheet" href="browser_options_page.css">
24 <link rel="stylesheet" href="clear_browser_data_overlay.css"> 24 <link rel="stylesheet" href="clear_browser_data_overlay.css">
25 <link rel="stylesheet" href="content_settings.css"> 25 <link rel="stylesheet" href="content_settings.css">
26 <link rel="stylesheet" href="cookies_view.css"> 26 <link rel="stylesheet" href="cookies_view.css">
27 <link rel="stylesheet" href="font_settings.css"> 27 <link rel="stylesheet" href="font_settings.css">
28 <if expr="pp_ifdef('enable_register_protocol_handler')"> 28 <if expr="pp_ifdef('enable_register_protocol_handler')">
29 <link rel="stylesheet" href="handler_options.css"> 29 <link rel="stylesheet" href="handler_options.css">
30 </if> 30 </if>
31 <link rel="stylesheet" href="import_data_overlay.css"> 31 <link rel="stylesheet" href="import_data_overlay.css">
32 <if expr="pp_ifdef('enable_web_intents')">
33 <link rel="stylesheet" href="intents_view.css">
34 </if>
32 <link rel="stylesheet" href="language_options.css"> 35 <link rel="stylesheet" href="language_options.css">
33 <link rel="stylesheet" href="manage_profile_overlay.css"> 36 <link rel="stylesheet" href="manage_profile_overlay.css">
34 <link rel="stylesheet" href="password_manager.css"> 37 <link rel="stylesheet" href="password_manager.css">
35 <link rel="stylesheet" href="password_manager_list.css"> 38 <link rel="stylesheet" href="password_manager_list.css">
36 <link rel="stylesheet" href="personal_options.css"> 39 <link rel="stylesheet" href="personal_options.css">
37 <link rel="stylesheet" href="search_engine_manager.css"> 40 <link rel="stylesheet" href="search_engine_manager.css">
38 <link rel="stylesheet" href="search_page.css"> 41 <link rel="stylesheet" href="search_page.css">
39 <link rel="stylesheet" href="subpages_tab_controls.css"> 42 <link rel="stylesheet" href="subpages_tab_controls.css">
40 <link rel="stylesheet" href="../sync_setup_overlay.css"> 43 <link rel="stylesheet" href="../sync_setup_overlay.css">
41 <if expr="pp_ifdef('chromeos')"> 44 <if expr="pp_ifdef('chromeos')">
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 <include src="chromeos/language_mozc_options.html"> 160 <include src="chromeos/language_mozc_options.html">
158 <include src="chromeos/language_pinyin_options.html"> 161 <include src="chromeos/language_pinyin_options.html">
159 </if> 162 </if>
160 <if expr="pp_ifdef('chromeos') and pp_ifdef('touchui')"> 163 <if expr="pp_ifdef('chromeos') and pp_ifdef('touchui')">
161 <include src="chromeos/virtual_keyboard.html"> 164 <include src="chromeos/virtual_keyboard.html">
162 </if> 165 </if>
163 <include src="cookies_view.html"> 166 <include src="cookies_view.html">
164 <if expr="pp_ifdef('enable_register_protocol_handler')"> 167 <if expr="pp_ifdef('enable_register_protocol_handler')">
165 <include src="handler_options.html"> 168 <include src="handler_options.html">
166 </if> 169 </if>
170 <if expr="pp_ifdef('enable_web_intents')">
171 <include src="intents_view.html">
172 </if>
167 <include src="content_settings_exceptions_area.html"> 173 <include src="content_settings_exceptions_area.html">
168 </div> 174 </div>
169 </div> 175 </div>
170 </div> 176 </div>
171 </div> 177 </div>
172 </div> 178 </div>
173 </div> 179 </div>
174 <script src="chrome://settings/strings.js"></script> 180 <script src="chrome://settings/strings.js"></script>
175 <script src="chrome://resources/js/i18n_template.js"></script> 181 <script src="chrome://resources/js/i18n_template.js"></script>
176 <script src="chrome://resources/js/i18n_process.js"></script> 182 <script src="chrome://resources/js/i18n_process.js"></script>
177 </body> 183 </body>
178 </html> 184 </html>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/intents_view.js ('k') | chrome/browser/resources/options/options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698