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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/options2/options.html
diff --git a/chrome/browser/resources/options2/options.html b/chrome/browser/resources/options2/options.html
index 8e879e5462e48fda1eb405bab590361d830653e0..e448114bff217215335e30f5048d7fea604ab100 100644
--- a/chrome/browser/resources/options2/options.html
+++ b/chrome/browser/resources/options2/options.html
@@ -38,11 +38,14 @@
<if expr="pp_ifdef('chromeos')">
<link rel="stylesheet" href="chromeos/accounts_options_page.css">
<link rel="stylesheet" href="chromeos/bluetooth.css">
- <link rel="stylesheet" href="chromeos/change_picture_options.css">
+ <link rel="stylesheet" href="chromeos/image_picker.css">
<link rel="stylesheet" href="chromeos/internet_detail.css">
<link rel="stylesheet" href="chromeos/internet_options_page.css">
<link rel="stylesheet" href="chromeos/pointer_overlay.css">
</if>
+<if expr="pp_ifdef('chromeos') and pp_ifdef('use_ash')">
+ <link rel="stylesheet" href="chromeos/set_wallpaper_options.css">
+</if>
<if expr="pp_ifdef('chromeos') and pp_ifdef('use_virtual_keyboard')">
<link rel="stylesheet" href="chromeos/virtual_keyboard.css">
</if>
@@ -100,6 +103,9 @@
<include src="chromeos/keyboard_overlay.html">
<include src="chromeos/pointer_overlay.html">
</if>
+ <if expr="pp_ifdef('chromeos') and pp_ifdef('use_ash')">
+ <include src="chromeos/set_wallpaper_options.html">
+ </if>
<if expr="not is_win and not is_macosx">
<include src="certificate_manager.html">
</if>
« 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