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

Unified Diff: chrome/browser/resources/options2/browser_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/browser_options.html
diff --git a/chrome/browser/resources/options2/browser_options.html b/chrome/browser/resources/options2/browser_options.html
index 0f358f5e680455fbaafbef10fdc1943bd39e2e62..23557aa85dfebddb9dd59f1be74da265a339dca5 100644
--- a/chrome/browser/resources/options2/browser_options.html
+++ b/chrome/browser/resources/options2/browser_options.html
@@ -89,21 +89,22 @@
</if>
<section>
<h3 i18n-content="sectionTitleAppearance"></h3>
-<if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx">
<div>
+<if expr="pp_ifdef('chromeos') and pp_ifdef('use_ash')">
+ <button id="set-wallpaper" i18n-content="setWallpaper"></button>
+</if>
+<if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx">
<button id="themes-gallery" i18n-content="themesGallery"></button>
<button id="themes-GTK-button"
i18n-content="themesGTKButton"></button>
<button id="themes-reset"
i18n-content="themesSetClassic"></button>
- </div>
</if>
<if expr="pp_ifdef('toolkit_views') or is_win or is_macosx">
- <div>
<button id="themes-gallery" i18n-content="themesGallery"></button>
<button id="themes-reset" i18n-content="themesReset"></button>
- </div>
</if>
+ </div>
<div class="settings-row">
<span i18n-content="homePage"></span>
<select id="home-page-select">
« no previous file with comments | « chrome/browser/chromeos/login/user_manager_impl.cc ('k') | chrome/browser/resources/options2/browser_options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698