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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 9232010: [uber page] Migrate all elements in the 'System' (cros) page to new locations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: compile fix 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/chromeos/system_options_page.css ('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 28 matching lines...) Expand all
39 <link rel="stylesheet" href="subpages_tab_controls.css"> 39 <link rel="stylesheet" href="subpages_tab_controls.css">
40 <link rel="stylesheet" href="startup_overlay.css"> 40 <link rel="stylesheet" href="startup_overlay.css">
41 <link rel="stylesheet" href="../sync_setup_overlay.css"> 41 <link rel="stylesheet" href="../sync_setup_overlay.css">
42 <if expr="pp_ifdef('chromeos')"> 42 <if expr="pp_ifdef('chromeos')">
43 <link rel="stylesheet" href="chromeos/accounts_options_page.css"> 43 <link rel="stylesheet" href="chromeos/accounts_options_page.css">
44 <link rel="stylesheet" herf="chromeos/bluetooth.css"> 44 <link rel="stylesheet" herf="chromeos/bluetooth.css">
45 <link rel="stylesheet" href="chromeos/change_picture_options.css"> 45 <link rel="stylesheet" href="chromeos/change_picture_options.css">
46 <link rel="stylesheet" href="chromeos/internet_options_page.css"> 46 <link rel="stylesheet" href="chromeos/internet_options_page.css">
47 <link rel="stylesheet" herf="chromeos/pointer_overlay.css"> 47 <link rel="stylesheet" herf="chromeos/pointer_overlay.css">
48 <link rel="stylesheet" href="chromeos/proxy.css"> 48 <link rel="stylesheet" href="chromeos/proxy.css">
49 <link rel="stylesheet" href="chromeos/system_options_page.css">
50 </if> 49 </if>
51 <if expr="pp_ifdef('chromeos') and pp_ifdef('use_virtual_keyboard')"> 50 <if expr="pp_ifdef('chromeos') and pp_ifdef('use_virtual_keyboard')">
52 <link rel="stylesheet" href="chromeos/virtual_keyboard.css"> 51 <link rel="stylesheet" href="chromeos/virtual_keyboard.css">
53 </if> 52 </if>
54 53
55 <if expr="not pp_ifdef('win32') and not pp_ifdef('darwin')"> 54 <if expr="not pp_ifdef('win32') and not pp_ifdef('darwin')">
56 <link rel="stylesheet" href="certificate_manager.css"> 55 <link rel="stylesheet" href="certificate_manager.css">
57 <link rel="stylesheet" href="certificate_tree.css"> 56 <link rel="stylesheet" href="certificate_tree.css">
58 </if> 57 </if>
59 58
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 <if expr="pp_ifdef('chromeos')"> 120 <if expr="pp_ifdef('chromeos')">
122 <include src="chromeos/system_options.html">
123 <include src="chromeos/internet_options.html"> 121 <include src="chromeos/internet_options.html">
124 <include src="chromeos/accounts_options.html"> 122 <include src="chromeos/accounts_options.html">
125 </if> 123 </if>
126 </div> 124 </div>
127 <div id="subpage-sheet-container-1" 125 <div id="subpage-sheet-container-1"
128 class="subpage-sheet-container transparent" hidden> 126 class="subpage-sheet-container transparent" hidden>
129 <div id="subpage-sheet-1" class="subpage-sheet"> 127 <div id="subpage-sheet-1" class="subpage-sheet">
130 <button class="raw-button close-subpage custom-appearance"></button> 128 <button class="raw-button close-subpage custom-appearance"></button>
131 <div class="subpage-sheet-contents"> 129 <div class="subpage-sheet-contents">
132 <include src="search_engine_manager.html"> 130 <include src="search_engine_manager.html">
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 </div> 178 </div>
181 </div> 179 </div>
182 </div> 180 </div>
183 </div> 181 </div>
184 </div> 182 </div>
185 <script src="chrome://settings-frame/strings.js"></script> 183 <script src="chrome://settings-frame/strings.js"></script>
186 <script src="chrome://resources/js/i18n_template.js"></script> 184 <script src="chrome://resources/js/i18n_template.js"></script>
187 <script src="chrome://resources/js/i18n_process.js"></script> 185 <script src="chrome://resources/js/i18n_process.js"></script>
188 </body> 186 </body>
189 </html> 187 </html>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options2/chromeos/system_options_page.css ('k') | chrome/browser/resources/options2/options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698