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

Unified Diff: chrome/browser/resources/options2/options.html

Issue 9580023: Enable user change background image in settings page in Aura build. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Address review 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 4e97b7ee68b6118e9b4f2f13a2d342465f937da5..8e8b37bb219ce1c1b4c507043ad28ecc90c6715a 100644
--- a/chrome/browser/resources/options2/options.html
+++ b/chrome/browser/resources/options2/options.html
@@ -38,12 +38,15 @@
<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">
<link rel="stylesheet" href="chromeos/proxy.css">
</if>
+<if expr="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>
@@ -99,6 +102,9 @@
<include src="chromeos/keyboard_overlay.html">
<include src="chromeos/pointer_overlay.html">
</if>
+ <if expr="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>

Powered by Google App Engine
This is Rietveld 408576698