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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 9181013: [uber page] Migrate remaining Personal options into Browser options. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: How about another rebase! (damn you generated_resources.grd) 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
« no previous file with comments | « chrome/browser/resources/options2/browser_options_profile_list.js ('k') | chrome/browser/resources/options2/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 <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 16 matching lines...) Expand all
27 <link rel="stylesheet" href="handler_options.css"> 27 <link rel="stylesheet" href="handler_options.css">
28 </if> 28 </if>
29 <link rel="stylesheet" href="import_data_overlay.css"> 29 <link rel="stylesheet" href="import_data_overlay.css">
30 <if expr="pp_ifdef('enable_web_intents')"> 30 <if expr="pp_ifdef('enable_web_intents')">
31 <link rel="stylesheet" href="intents_view.css"> 31 <link rel="stylesheet" href="intents_view.css">
32 </if> 32 </if>
33 <link rel="stylesheet" href="language_options.css"> 33 <link rel="stylesheet" href="language_options.css">
34 <link rel="stylesheet" href="manage_profile_overlay.css"> 34 <link rel="stylesheet" href="manage_profile_overlay.css">
35 <link rel="stylesheet" href="password_manager.css"> 35 <link rel="stylesheet" href="password_manager.css">
36 <link rel="stylesheet" href="password_manager_list.css"> 36 <link rel="stylesheet" href="password_manager_list.css">
37 <link rel="stylesheet" href="personal_options.css">
38 <link rel="stylesheet" href="search_engine_manager.css"> 37 <link rel="stylesheet" href="search_engine_manager.css">
39 <link rel="stylesheet" href="search_page.css"> 38 <link rel="stylesheet" href="search_page.css">
40 <link rel="stylesheet" href="subpages_tab_controls.css"> 39 <link rel="stylesheet" href="subpages_tab_controls.css">
41 <link rel="stylesheet" href="startup_overlay.css"> 40 <link rel="stylesheet" href="startup_overlay.css">
42 <link rel="stylesheet" href="../sync_setup_overlay.css"> 41 <link rel="stylesheet" href="../sync_setup_overlay.css">
43 <if expr="pp_ifdef('chromeos')"> 42 <if expr="pp_ifdef('chromeos')">
44 <link rel="stylesheet" href="chromeos/accounts_options_page.css"> 43 <link rel="stylesheet" href="chromeos/accounts_options_page.css">
45 <link rel="stylesheet" href="chromeos/change_picture_options.css"> 44 <link rel="stylesheet" href="chromeos/change_picture_options.css">
46 <link rel="stylesheet" href="chromeos/internet_options_page.css"> 45 <link rel="stylesheet" href="chromeos/internet_options_page.css">
47 <link rel="stylesheet" href="chromeos/proxy.css"> 46 <link rel="stylesheet" href="chromeos/proxy.css">
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 <span id="managed-prefs-icon" class="managed-prefs-icon"></span> 110 <span id="managed-prefs-icon" class="managed-prefs-icon"></span>
112 <span id="managed-prefs-text" class="managed-prefs-text"></span> 111 <span id="managed-prefs-text" class="managed-prefs-text"></span>
113 </div> 112 </div>
114 <div id="subpage-backdrop" hidden></div> 113 <div id="subpage-backdrop" hidden></div>
115 <div id="mainview-content"> 114 <div id="mainview-content">
116 <div id="page-container"> 115 <div id="page-container">
117 <!-- Please keep the main pages in desired order of display. This will 116 <!-- Please keep the main pages in desired order of display. This will
118 allow search results to display in the desired order. --> 117 allow search results to display in the desired order. -->
119 <include src="search_page.html"> 118 <include src="search_page.html">
120 <include src="browser_options.html"> 119 <include src="browser_options.html">
121 <include src="personal_options.html">
122 <if expr="pp_ifdef('chromeos')"> 120 <if expr="pp_ifdef('chromeos')">
123 <include src="chromeos/system_options.html"> 121 <include src="chromeos/system_options.html">
124 <include src="chromeos/internet_options.html"> 122 <include src="chromeos/internet_options.html">
125 <include src="chromeos/accounts_options.html"> 123 <include src="chromeos/accounts_options.html">
126 </if> 124 </if>
127 </div> 125 </div>
128 <div id="subpage-sheet-container-1" 126 <div id="subpage-sheet-container-1"
129 class="subpage-sheet-container transparent" hidden> 127 class="subpage-sheet-container transparent" hidden>
130 <div id="subpage-sheet-1" class="subpage-sheet"> 128 <div id="subpage-sheet-1" class="subpage-sheet">
131 <button class="raw-button close-subpage custom-appearance"></button> 129 <button class="raw-button close-subpage custom-appearance"></button>
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 </div> 179 </div>
182 </div> 180 </div>
183 </div> 181 </div>
184 </div> 182 </div>
185 </div> 183 </div>
186 <script src="chrome://settings-frame/strings.js"></script> 184 <script src="chrome://settings-frame/strings.js"></script>
187 <script src="chrome://resources/js/i18n_template.js"></script> 185 <script src="chrome://resources/js/i18n_template.js"></script>
188 <script src="chrome://resources/js/i18n_process.js"></script> 186 <script src="chrome://resources/js/i18n_process.js"></script>
189 </body> 187 </body>
190 </html> 188 </html>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options2/browser_options_profile_list.js ('k') | chrome/browser/resources/options2/options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698