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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 <div id="settings" class="page" hidden> 1 <div id="settings" class="page" hidden>
2 <header> 2 <header>
3 <h1 i18n-content="settingsTitle"></h1> 3 <h1 i18n-content="settingsTitle"></h1>
4 <span id="browser-options-search-field-container" 4 <span id="browser-options-search-field-container"
5 class="search-field-container"> 5 class="search-field-container">
6 <input id="search-field" type="search" 6 <input id="search-field" type="search"
7 i18n-values="placeholder:searchPlaceholder; 7 i18n-values="placeholder:searchPlaceholder;
8 aria-label:searchPlaceholder" incremental> 8 aria-label:searchPlaceholder" incremental>
9 </span> 9 </span>
10 </header> 10 </header>
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 i18n-content="startupSetPages"> 82 i18n-content="startupSetPages">
83 </button> 83 </button>
84 </span> 84 </span>
85 </label> 85 </label>
86 </div> 86 </div>
87 </div> 87 </div>
88 </section> 88 </section>
89 </if> 89 </if>
90 <section> 90 <section>
91 <h3 i18n-content="sectionTitleAppearance"></h3> 91 <h3 i18n-content="sectionTitleAppearance"></h3>
92 <div>
93 <if expr="pp_ifdef('chromeos') and pp_ifdef('use_ash')">
94 <button id="set-wallpaper" i18n-content="setWallpaper"></button>
95 </if>
92 <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx"> 96 <if expr="not pp_ifdef('toolkit_views') and is_posix and not is_macosx">
93 <div>
94 <button id="themes-gallery" i18n-content="themesGallery"></button> 97 <button id="themes-gallery" i18n-content="themesGallery"></button>
95 <button id="themes-GTK-button" 98 <button id="themes-GTK-button"
96 i18n-content="themesGTKButton"></button> 99 i18n-content="themesGTKButton"></button>
97 <button id="themes-reset" 100 <button id="themes-reset"
98 i18n-content="themesSetClassic"></button> 101 i18n-content="themesSetClassic"></button>
99 </div>
100 </if> 102 </if>
101 <if expr="pp_ifdef('toolkit_views') or is_win or is_macosx"> 103 <if expr="pp_ifdef('toolkit_views') or is_win or is_macosx">
102 <div>
103 <button id="themes-gallery" i18n-content="themesGallery"></button> 104 <button id="themes-gallery" i18n-content="themesGallery"></button>
104 <button id="themes-reset" i18n-content="themesReset"></button> 105 <button id="themes-reset" i18n-content="themesReset"></button>
106 </if>
105 </div> 107 </div>
106 </if>
107 <div class="settings-row"> 108 <div class="settings-row">
108 <span i18n-content="homePage"></span> 109 <span i18n-content="homePage"></span>
109 <select id="home-page-select"> 110 <select id="home-page-select">
110 <option value="none" i18n-content="homePageNone"></option> 111 <option value="none" i18n-content="homePageNone"></option>
111 <option value="ntp" i18n-content="homePageNtp"></option> 112 <option value="ntp" i18n-content="homePageNtp"></option>
112 <option dir="ltr" value="url"></option> 113 <option dir="ltr" value="url"></option>
113 <option value="choose" i18n-content="homePageChoose"></option> 114 <option value="choose" i18n-content="homePageChoose"></option>
114 </select> 115 </select>
115 </div> 116 </div>
116 <div class="checkbox"><label> 117 <div class="checkbox"><label>
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after
611 </section> 612 </section>
612 </if> 613 </if>
613 </div> <!-- advanced-settings-container --> 614 </div> <!-- advanced-settings-container -->
614 </div> <!-- advanced-settings --> 615 </div> <!-- advanced-settings -->
615 <footer> 616 <footer>
616 <button id="advanced-settings-expander" class="link-button" 617 <button id="advanced-settings-expander" class="link-button"
617 i18n-content="showAdvancedSettings"> 618 i18n-content="showAdvancedSettings">
618 </button> 619 </button>
619 </footer> 620 </footer>
620 </div> 621 </div>
OLDNEW
« 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