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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 9703031: Retry landing "Enable users change desktop background image from settings page in Chromeos Aura bui… (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Merge to trunk Created 8 years, 9 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/set_wallpaper_options.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 <link rel="icon" href="chrome://theme/IDR_SETTINGS_FAVICON"> 6 <link rel="icon" href="chrome://theme/IDR_SETTINGS_FAVICON">
7 <link rel="stylesheet" href="chrome://resources/css/list.css"> 7 <link rel="stylesheet" href="chrome://resources/css/list.css">
8 <link rel="stylesheet" href="chrome://resources/css/overlay.css"> 8 <link rel="stylesheet" href="chrome://resources/css/overlay.css">
9 <link rel="stylesheet" href="chrome://resources/css/spinner.css"> 9 <link rel="stylesheet" href="chrome://resources/css/spinner.css">
10 <link rel="stylesheet" href="chrome://resources/css/throbber.css"> 10 <link rel="stylesheet" href="chrome://resources/css/throbber.css">
(...skipping 20 matching lines...) Expand all
31 <link rel="stylesheet" href="password_manager.css"> 31 <link rel="stylesheet" href="password_manager.css">
32 <link rel="stylesheet" href="password_manager_list.css"> 32 <link rel="stylesheet" href="password_manager_list.css">
33 <link rel="stylesheet" href="search_engine_manager.css"> 33 <link rel="stylesheet" href="search_engine_manager.css">
34 <link rel="stylesheet" href="search_page.css"> 34 <link rel="stylesheet" href="search_page.css">
35 <link rel="stylesheet" href="subpages_tab_controls.css"> 35 <link rel="stylesheet" href="subpages_tab_controls.css">
36 <link rel="stylesheet" href="startup_overlay.css"> 36 <link rel="stylesheet" href="startup_overlay.css">
37 <link rel="stylesheet" href="../sync_setup_overlay.css"> 37 <link rel="stylesheet" href="../sync_setup_overlay.css">
38 <if expr="pp_ifdef('chromeos')"> 38 <if expr="pp_ifdef('chromeos')">
39 <link rel="stylesheet" href="chromeos/accounts_options_page.css"> 39 <link rel="stylesheet" href="chromeos/accounts_options_page.css">
40 <link rel="stylesheet" href="chromeos/bluetooth.css"> 40 <link rel="stylesheet" href="chromeos/bluetooth.css">
41 <link rel="stylesheet" href="chromeos/change_picture_options.css"> 41 <link rel="stylesheet" href="chromeos/image_picker.css">
42 <link rel="stylesheet" href="chromeos/internet_detail.css"> 42 <link rel="stylesheet" href="chromeos/internet_detail.css">
43 <link rel="stylesheet" href="chromeos/internet_options_page.css"> 43 <link rel="stylesheet" href="chromeos/internet_options_page.css">
44 <link rel="stylesheet" href="chromeos/pointer_overlay.css"> 44 <link rel="stylesheet" href="chromeos/pointer_overlay.css">
45 </if> 45 </if>
46 <if expr="pp_ifdef('chromeos') and pp_ifdef('use_ash')">
47 <link rel="stylesheet" href="chromeos/set_wallpaper_options.css">
48 </if>
46 <if expr="pp_ifdef('chromeos') and pp_ifdef('use_virtual_keyboard')"> 49 <if expr="pp_ifdef('chromeos') and pp_ifdef('use_virtual_keyboard')">
47 <link rel="stylesheet" href="chromeos/virtual_keyboard.css"> 50 <link rel="stylesheet" href="chromeos/virtual_keyboard.css">
48 </if> 51 </if>
49 <if expr="not is_win and not is_macosx"> 52 <if expr="not is_win and not is_macosx">
50 <link rel="stylesheet" href="certificate_manager.css"> 53 <link rel="stylesheet" href="certificate_manager.css">
51 <link rel="stylesheet" href="certificate_tree.css"> 54 <link rel="stylesheet" href="certificate_tree.css">
52 </if> 55 </if>
53 <script src="chrome://resources/css/tree.css.js"></script> 56 <script src="chrome://resources/css/tree.css.js"></script>
54 <script src="chrome://resources/js/cr.js"></script> 57 <script src="chrome://resources/js/cr.js"></script>
55 <script src="chrome://resources/js/cr/command_line.js"></script> 58 <script src="chrome://resources/js/cr/command_line.js"></script>
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 <include src="../sync_setup_overlay.html"> 96 <include src="../sync_setup_overlay.html">
94 <if expr="pp_ifdef('chromeos')"> 97 <if expr="pp_ifdef('chromeos')">
95 <include src="chromeos/accounts_options.html"> 98 <include src="chromeos/accounts_options.html">
96 <include src="chromeos/bluetooth_add_device_overlay.html"> 99 <include src="chromeos/bluetooth_add_device_overlay.html">
97 <include src="chromeos/bluetooth_pair_device_overlay.html"> 100 <include src="chromeos/bluetooth_pair_device_overlay.html">
98 <include src="chromeos/change_picture_options.html"> 101 <include src="chromeos/change_picture_options.html">
99 <include src="chromeos/internet_options.html"> 102 <include src="chromeos/internet_options.html">
100 <include src="chromeos/keyboard_overlay.html"> 103 <include src="chromeos/keyboard_overlay.html">
101 <include src="chromeos/pointer_overlay.html"> 104 <include src="chromeos/pointer_overlay.html">
102 </if> 105 </if>
106 <if expr="pp_ifdef('chromeos') and pp_ifdef('use_ash')">
107 <include src="chromeos/set_wallpaper_options.html">
108 </if>
103 <if expr="not is_win and not is_macosx"> 109 <if expr="not is_win and not is_macosx">
104 <include src="certificate_manager.html"> 110 <include src="certificate_manager.html">
105 </if> 111 </if>
106 </div> 112 </div>
107 <div id="overlay-container-2" class="overlay transparent" hidden> 113 <div id="overlay-container-2" class="overlay transparent" hidden>
108 <include src="alert_overlay.html"> 114 <include src="alert_overlay.html">
109 <include src="autofill_edit_address_overlay.html"> 115 <include src="autofill_edit_address_overlay.html">
110 <include src="autofill_edit_creditcard_overlay.html"> 116 <include src="autofill_edit_creditcard_overlay.html">
111 <include src="content_settings_exceptions_area.html"> 117 <include src="content_settings_exceptions_area.html">
112 <include src="cookies_view.html"> 118 <include src="cookies_view.html">
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 <span id="managed-prefs-text" class="managed-prefs-text"></span> 160 <span id="managed-prefs-text" class="managed-prefs-text"></span>
155 </div> 161 </div>
156 </div> 162 </div>
157 </div> 163 </div>
158 164
159 <script src="chrome://settings-frame/strings.js"></script> 165 <script src="chrome://settings-frame/strings.js"></script>
160 <script src="chrome://resources/js/i18n_template.js"></script> 166 <script src="chrome://resources/js/i18n_template.js"></script>
161 <script src="chrome://resources/js/i18n_process.js"></script> 167 <script src="chrome://resources/js/i18n_process.js"></script>
162 </body> 168 </body>
163 </html> 169 </html>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options2/chromeos/set_wallpaper_options.js ('k') | chrome/browser/resources/options2/options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698