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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 23665004: sync (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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/media_galleries_manager_overlay.html ('k') | chrome/browser/resources/options/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="stylesheet" href="chrome://resources/css/bubble.css"> 6 <link rel="stylesheet" href="chrome://resources/css/bubble.css">
7 <link rel="stylesheet" href="chrome://resources/css/bubble_button.css"> 7 <link rel="stylesheet" href="chrome://resources/css/bubble_button.css">
8 <link rel="stylesheet" href="chrome://resources/css/chrome_shared.css"> 8 <link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
9 <link rel="stylesheet" href="chrome://resources/css/dialog_overlay.css">
9 <link rel="stylesheet" href="chrome://resources/css/list.css"> 10 <link rel="stylesheet" href="chrome://resources/css/list.css">
10 <link rel="stylesheet" href="chrome://resources/css/overlay.css">
11 <link rel="stylesheet" href="chrome://resources/css/spinner.css"> 11 <link rel="stylesheet" href="chrome://resources/css/spinner.css">
12 <link rel="stylesheet" href="chrome://resources/css/throbber.css"> 12 <link rel="stylesheet" href="chrome://resources/css/throbber.css">
13 <link rel="stylesheet" href="chrome://resources/css/tree.css"> 13 <link rel="stylesheet" href="chrome://resources/css/tree.css">
14 <link rel="stylesheet" href="../uber/uber_shared.css"> 14 <link rel="stylesheet" href="../uber/uber_shared.css">
15 <link rel="stylesheet" href="options_page.css"> 15 <link rel="stylesheet" href="options_page.css">
16 <link rel="stylesheet" href="alert_overlay.css"> 16 <link rel="stylesheet" href="alert_overlay.css">
17 <link rel="stylesheet" href="autofill_edit_overlay.css"> 17 <link rel="stylesheet" href="autofill_edit_overlay.css">
18 <link rel="stylesheet" href="autofill_options.css"> 18 <link rel="stylesheet" href="autofill_options.css">
19 <link rel="stylesheet" href="browser_options.css"> 19 <link rel="stylesheet" href="browser_options.css">
20 <if expr="pp_ifdef('chromeos')"> 20 <if expr="pp_ifdef('chromeos')">
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 </if> 63 </if>
64 <script src="chrome://resources/css/tree.css.js"></script> 64 <script src="chrome://resources/css/tree.css.js"></script>
65 <script src="chrome://resources/js/cr.js"></script> 65 <script src="chrome://resources/js/cr.js"></script>
66 <script src="chrome://resources/js/event_tracker.js"></script> 66 <script src="chrome://resources/js/event_tracker.js"></script>
67 <script src="chrome://resources/js/cr/event_target.js"></script> 67 <script src="chrome://resources/js/cr/event_target.js"></script>
68 <script src="chrome://resources/js/cr/ui.js"></script> 68 <script src="chrome://resources/js/cr/ui.js"></script>
69 <script src="chrome://resources/js/cr/ui/touch_handler.js"></script> 69 <script src="chrome://resources/js/cr/ui/touch_handler.js"></script>
70 <script src="chrome://resources/js/cr/ui/array_data_model.js"></script> 70 <script src="chrome://resources/js/cr/ui/array_data_model.js"></script>
71 <script src="chrome://resources/js/cr/ui/bubble.js"></script> 71 <script src="chrome://resources/js/cr/ui/bubble.js"></script>
72 <script src="chrome://resources/js/cr/ui/bubble_button.js"></script> 72 <script src="chrome://resources/js/cr/ui/bubble_button.js"></script>
73 <script src="chrome://resources/js/cr/ui/dialog_overlay.js"></script>
73 <script src="chrome://resources/js/cr/ui/focus_manager.js"></script> 74 <script src="chrome://resources/js/cr/ui/focus_manager.js"></script>
74 <script src="chrome://resources/js/cr/ui/focus_outline_manager.js"></script> 75 <script src="chrome://resources/js/cr/ui/focus_outline_manager.js"></script>
75 <script src="chrome://resources/js/cr/ui/list_selection_model.js"></script> 76 <script src="chrome://resources/js/cr/ui/list_selection_model.js"></script>
76 <script src="chrome://resources/js/cr/ui/list_selection_controller.js"></script> 77 <script src="chrome://resources/js/cr/ui/list_selection_controller.js"></script>
77 <script src="chrome://resources/js/cr/ui/list_single_selection_model.js"> 78 <script src="chrome://resources/js/cr/ui/list_single_selection_model.js">
78 </script> 79 </script>
79 <script src="chrome://resources/js/cr/ui/list_item.js"></script> 80 <script src="chrome://resources/js/cr/ui/list_item.js"></script>
80 <script src="chrome://resources/js/cr/ui/list.js"></script> 81 <script src="chrome://resources/js/cr/ui/list.js"></script>
81 <script src="chrome://resources/js/cr/ui/menu_item.js"></script> 82 <script src="chrome://resources/js/cr/ui/menu_item.js"></script>
82 <script src="chrome://resources/js/cr/ui/menu.js"></script> 83 <script src="chrome://resources/js/cr/ui/menu.js"></script>
83 <script src="chrome://resources/js/cr/ui/autocomplete_list.js"></script> 84 <script src="chrome://resources/js/cr/ui/autocomplete_list.js"></script>
84 <script src="chrome://resources/js/cr/ui/grid.js"></script> 85 <script src="chrome://resources/js/cr/ui/grid.js"></script>
85 <script src="chrome://resources/js/cr/ui/overlay.js"></script>
86 <script src="chrome://resources/js/cr/ui/position_util.js"></script> 86 <script src="chrome://resources/js/cr/ui/position_util.js"></script>
87 <script src="chrome://resources/js/cr/ui/repeating_button.js"></script> 87 <script src="chrome://resources/js/cr/ui/repeating_button.js"></script>
88 <script src="chrome://resources/js/cr/ui/tree.js"></script> 88 <script src="chrome://resources/js/cr/ui/tree.js"></script>
89 <script src="chrome://resources/js/load_time_data.js"></script> 89 <script src="chrome://resources/js/load_time_data.js"></script>
90 <script src="chrome://resources/js/util.js"></script> 90 <script src="chrome://resources/js/util.js"></script>
91 91
92 <script src="chrome://settings-frame/strings.js"></script> 92 <script src="chrome://settings-frame/strings.js"></script>
93 <script src="chrome://settings-frame/options_bundle.js"></script> 93 <script src="chrome://settings-frame/options_bundle.js"></script>
94 </head> 94 </head>
95 95
96 <body class="uber-frame" 96 <body class="uber-frame"
97 i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize"> 97 i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
98 <div id="overlay-container-1" class="overlay transparent" hidden> 98 <div class="overlay-container">
99 <include src="autofill_options.html"> 99 <include src="autofill_options.html">
100 <include src="clear_browser_data_overlay.html"> 100 <include src="clear_browser_data_overlay.html">
101 <include src="content_settings.html"> 101 <include src="content_settings.html">
102 <include src="content_settings2.html"> 102 <include src="content_settings2.html">
103 <include src="do_not_track_confirm_overlay.html"> 103 <include src="do_not_track_confirm_overlay.html">
104 <include src="font_settings.html"> 104 <include src="font_settings.html">
105 <include src="home_page_overlay.html"> 105 <include src="home_page_overlay.html">
106 <include src="import_data_overlay.html"> 106 <include src="import_data_overlay.html">
107 <include src="language_options.html"> 107 <include src="language_options.html">
108 <include src="manage_profile_overlay.html"> 108 <include src="manage_profile_overlay.html">
(...skipping 11 matching lines...) Expand all
120 <include src="chromeos/change_picture_options.html"> 120 <include src="chromeos/change_picture_options.html">
121 <include src="chromeos/display_options.html"> 121 <include src="chromeos/display_options.html">
122 <include src="chromeos/keyboard_overlay.html"> 122 <include src="chromeos/keyboard_overlay.html">
123 <include src="chromeos/pointer_overlay.html"> 123 <include src="chromeos/pointer_overlay.html">
124 <include src="factory_reset_overlay.html"> 124 <include src="factory_reset_overlay.html">
125 </if> 125 </if>
126 <if expr="pp_ifdef('use_nss')"> 126 <if expr="pp_ifdef('use_nss')">
127 <include src="certificate_manager.html"> 127 <include src="certificate_manager.html">
128 </if> 128 </if>
129 </div> 129 </div>
130 <div id="overlay-container-2" class="overlay transparent" hidden> 130 <div class="overlay-container">
131 <include src="alert_overlay.html"> 131 <include src="alert_overlay.html">
132 <include src="autofill_edit_address_overlay.html"> 132 <include src="autofill_edit_address_overlay.html">
133 <include src="autofill_edit_creditcard_overlay.html"> 133 <include src="autofill_edit_creditcard_overlay.html">
134 <include src="content_settings_exceptions_area.html"> 134 <include src="content_settings_exceptions_area.html">
135 <include src="cookies_view.html"> 135 <include src="cookies_view.html">
136 <include src="handler_options.html"> 136 <include src="handler_options.html">
137 <include src="language_add_language_overlay.html"> 137 <include src="language_add_language_overlay.html">
138 <include src="managed_user_learn_more.html"> 138 <include src="managed_user_learn_more.html">
139 <if expr="not is_macosx"> 139 <if expr="not is_macosx">
140 <include src="language_dictionary_overlay.html"> 140 <include src="language_dictionary_overlay.html">
141 </if> 141 </if>
142 <include src="media_galleries_manager_overlay.html"> 142 <include src="media_galleries_manager_overlay.html">
143 <if expr="pp_ifdef('chromeos')"> 143 <if expr="pp_ifdef('chromeos')">
144 <include src="chromeos/display_overscan.html"> 144 <include src="chromeos/display_overscan.html">
145 <include src="chromeos/internet_detail.html"> 145 <include src="chromeos/internet_detail.html">
146 <include src="chromeos/preferred_networks.html"> 146 <include src="chromeos/preferred_networks.html">
147 <include src="chromeos/language_chewing_options.html"> 147 <include src="chromeos/language_chewing_options.html">
148 <include src="chromeos/language_hangul_options.html"> 148 <include src="chromeos/language_hangul_options.html">
149 <include src="chromeos/language_mozc_options.html"> 149 <include src="chromeos/language_mozc_options.html">
150 <include src="chromeos/language_pinyin_options.html"> 150 <include src="chromeos/language_pinyin_options.html">
151 </if> 151 </if>
152 <if expr="not is_win and not is_macosx"> 152 <if expr="not is_win and not is_macosx">
153 <include src="certificate_restore_overlay.html"> 153 <include src="certificate_restore_overlay.html">
154 <include src="certificate_backup_overlay.html"> 154 <include src="certificate_backup_overlay.html">
155 <include src="certificate_edit_ca_trust_overlay.html"> 155 <include src="certificate_edit_ca_trust_overlay.html">
156 <include src="certificate_import_error_overlay.html"> 156 <include src="certificate_import_error_overlay.html">
157 </if> 157 </if>
158 </div> 158 </div>
159 <div id="overlay-container-3" class="overlay transparent" hidden>
160 </div>
161 159
162 <div id="main-content"> 160 <div id="main-content">
163 <div id="mainview"> 161 <div id="mainview">
164 <div id="mainview-content"> 162 <div id="mainview-content">
165 <div id="page-container"> 163 <div id="page-container">
166 <!-- Please keep the main pages in desired order of display. This will 164 <!-- Please keep the main pages in desired order of display. This will
167 allow search results to display in the desired order. --> 165 allow search results to display in the desired order. -->
168 <include src="search_box.html"> 166 <include src="search_box.html">
169 <include src="search_page.html"> 167 <include src="search_page.html">
170 <include src="browser_options.html"> 168 <include src="browser_options.html">
171 </div> 169 </div>
172 </div> 170 </div>
173 </div> 171 </div>
174 </div> 172 </div>
175 173
176 <script src="chrome://resources/js/i18n_template2.js"></script> 174 <script src="chrome://resources/js/i18n_template2.js"></script>
177 </body> 175 </body>
178 </html> 176 </html>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/media_galleries_manager_overlay.html ('k') | chrome/browser/resources/options/options_page.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698