[MD settings] appearance theme and wallpaper

chrome/browser/resources/settings/appearance_page/appearance_page.html

Index: chrome/browser/resources/settings/appearance_page/appearance_page.html
diff --git a/chrome/browser/resources/settings/appearance_page/appearance_page.html b/chrome/browser/resources/settings/appearance_page/appearance_page.html
index 21c63de4f89547319d6304d7ae4f724c3c1ba9de..784e625676b4d9bfb5658d0431c42a5e60daafb1 100644
--- a/chrome/browser/resources/settings/appearance_page/appearance_page.html
+++ b/chrome/browser/resources/settings/appearance_page/appearance_page.html
@@ -8,6 +8,7 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-button/paper-radio-button.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/paper-toggle-button.html">
+<link rel="import" href="chrome://md-settings/appearance_page/appearance_browser_proxy.html">
 <link rel="import" href="chrome://md-settings/controls/settings_dropdown_menu.html">
 <link rel="import" href="chrome://md-settings/controls/settings_input.html">
 <link rel="import" href="chrome://md-settings/controls/settings_radio_group.html">
@@ -31,30 +32,36 @@
         section="appearance">
       <neon-animatable id="main">
 <if expr="chromeos">
-        <div class="settings-box first two-line">
+        <div class="settings-box first two-line" id="wallpaperButton"
+            on-tap="openWallpaperManager_">
           <iron-icon icon="device:wallpaper"></iron-icon>
           <div class="start">
-            <div>[[i18n('setWallpaper')]]</div>
-            <div class="secondary">[[i18n('openWallpaperApp')]]</div>
+            <div>$i18n{setWallpaper}</div>
+            <div class="secondary">$i18n{openWallpaperApp}</div>
           </div>
         </div>
         <div class="settings-box two-line" on-tap="openThemesGallery_">
 </if>
 <if expr="not chromeos">
-        <div class="settings-box two-line first" on-tap="openThemesGallery_">
+        <div class="settings-box two-line first">
 </if>
-          <iron-icon icon="image:palette"></iron-icon>
-          <div class="start">
-            <div>[[i18n('getThemes')]]</div>
-            <div class="secondary">[[themeSublabel_]]</div>
+          <div class="layout horizontal center flex"
+              on-tap="openThemesGallery_">
+            <iron-icon icon="image:palette"></iron-icon>
+            <div>
+              <div>$i18n{getThemes}</div>
+              <div class="secondary">[[themeSublabel_]]</div>
+            </div>
           </div>
           <template is="dom-if" if="[[allowResetTheme_]]">
-            <paper-button on-tap="resetTheme_" class="secondary-action"
-                >[[i18n('resetToDefaultTheme')]]</paper-button>
+            <paper-button id="resetTheme" on-tap="resetTheme_"
+                class="secondary-action">
+              $i18n{resetToDefaultTheme}
+            </paper-button>
           </template>
         </div>
         <div class="settings-box two-line">
-          <settings-checkbox class="start" i18n-values="label:showHomeButton"
+          <settings-checkbox class="start" label="$i18n{showHomeButton}"
               sub-label="[[getShowHomeSubLabel_(prefs.homepage_is_newtabpage.value, prefs.homepage.value)]]"
               pref="{{prefs.browser.show_home_button}}">
           </settings-checkbox>
@@ -63,24 +70,24 @@
           <div class="list-frame">
             <settings-radio-group pref="{{prefs.homepage_is_newtabpage}}">
               <paper-radio-button class="list-item" name="true">
-                 [[i18n('homePageNtp')]]
+                $i18n{homePageNtp}
               </paper-radio-button>
               <paper-radio-button class="list-item" name="false">
-                [[i18n('other')]]
+                $i18n{other}
                 <settings-input no-label-float pref="{{prefs.homepage}}"
-                    label="[[i18n('exampleDotCom')]]">
+                    label="$i18n{exampleDotCom}">
                 </settings-input>
               </paper-radio-button>
             </settings-radio-group>
           </div>
         </template>
         <div class="settings-box">
-          <settings-checkbox class="start" i18n-values="label:showBookmarksBar"
+          <settings-checkbox class="start" label="$i18n{showBookmarksBar}"
               pref="{{prefs.bookmark_bar.show_on_all_tabs}}">
           </settings-checkbox>
         </div>
         <div class="settings-box">
-          <div class="start" i18n-content="fontSize"></div>
+          <div class="start">$i18n{fontSize}</div>
           <settings-dropdown-menu id="defaultFontSize"
               pref="{{prefs.webkit.webprefs.default_font_size}}"
               menu-options="[[fontSizeOptions_]]" no-label-float>
@@ -88,19 +95,19 @@
         </div>
         <div class="settings-box two-line" on-tap="onCustomizeFontsTap_">
           <div class="start">
-            <div i18n-content="customizeFonts"></div>
-            <div class="secondary" i18n-content="chooseFontsAndEncoding"></div>
+            <div>$i18n{customizeFonts}</div>
+          <div class="secondary">$i18n{chooseFontsAndEncoding}</div>
           </div>
         </div>
         <div class="settings-box">
-          <div class="start" i18n-content="pageZoom"></div>
+          <div class="start">$i18n{pageZoom}</div>
           <settings-dropdown-menu id="pageZoom" pref="{{defaultZoomLevel_}}"
               menu-options="[[pageZoomOptions_]]" no-label-float>
           </settings-dropdown-menu>
         </div>
       </neon-animatable>
       <template is="dom-if" name="appearance-fonts">
-        <settings-subpage page-title="[[i18n('customizeFonts')]]">
+        <settings-subpage page-title="$i18n{customizeFonts}">
           <settings-appearance-fonts-page prefs="{{prefs}}">
           </settings-appearance-fonts-page>
         </settings-subpage>