[MD settings] remove icons from wallpaper and themes rows; avoid opening theme page on reset

This CL removes the icons from the wallpaper and these rows (I believe
that is approved by Alan). This also avoids having the themes page open
up when resetting (removing) the current theme.

BUG=651715
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2390553004
Cr-Commit-Position: refs/heads/master@{#422866}

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

@@ -26,28 +26,26 @@
         <div class="settings-box first two-line" id="wallpaperButton"
             on-tap="openWallpaperManager_" actionable
             hidden="[[!pageVisibility.setWallpaper]]">
-          <iron-icon icon="settings:wallpaper"></iron-icon>
-          <div class="middle">
+          <div class="start">
             <div>$i18n{setWallpaper}</div>
             <div class="secondary">$i18n{openWallpaperApp}</div>
           </div>
           <button class="icon-external" is="paper-icon-button-light"></button>
         </div>
         <div class="settings-box two-line"
-            hidden="[[!pageVisibility.setTheme]]"
-            on-tap="openThemesGallery_" actionable>
+            hidden="[[!pageVisibility.setTheme]]" actionable>
 </if>
 <if expr="not chromeos">
         <div class="settings-box two-line first"
-            hidden="[[!pageVisibility.setTheme]]"
-            on-tap="openThemesGallery_" actionable>
+            hidden="[[!pageVisibility.setTheme]]" actionable>
 </if>
-          <iron-icon icon="settings:palette"></iron-icon>
-          <div class="middle">
-            <div>$i18n{theme}</div>
-            <div class="secondary">[[themeSublabel_]]</div>
+          <div class="start two-line" on-tap="openThemesGallery_">
+            <div class="flex">
+              <div>$i18n{theme}</div>
+              <div class="secondary">[[themeSublabel_]]</div>
+            </div>
+            <button class="icon-external" is="paper-icon-button-light"></button>
           </div>
-          <button class="icon-external" is="paper-icon-button-light"></button>
           <template is="dom-if" if="[[allowResetTheme_]]">
             <div class="secondary-action">
               <paper-button id="resetTheme" on-tap="resetTheme_"

chrome/browser/resources/settings/icons.html

@@ -107,9 +107,6 @@
       <g id="videocam"><path d="M17 10.5V7c0-.55-.45-1-1-1H4c-.55 0-1 .45-1 1v10c0 .55.45 1 1 1h12c.55 0 1-.45 1-1v-3.5l4 4v-11l-4 4z"></path></g>
       <g id="visibility"><path d="M12 4.5C7 4.5 2.73 7.61 1 12c1.73 4.39 6 7.5 11 7.5s9.27-3.11 11-7.5c-1.73-4.39-6-7.5-11-7.5zM12 17c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5 5-2.24 5-5 5zm0-8c-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3-1.34-3-3-3z"></path></g>
       <g id="volume-up"><path d="M3 9v6h4l5 5V4L7 9H3zm13.5 3c0-1.77-1.02-3.29-2.5-4.03v8.05c1.48-.73 2.5-2.25 2.5-4.02zM14 3.23v2.06c2.89.86 5 3.54 5 6.71s-2.11 5.85-5 6.71v2.06c4.01-.91 7-4.49 7-8.77s-2.99-7.86-7-8.77z"></path></g>
-<if expr="chromeos">
-      <g id="wallpaper"><path d="M4 4h7V2H4c-1.1 0-2 .9-2 2v7h2V4zm6 9l-4 5h12l-3-4-2.03 2.71L10 13zm7-4.5c0-.83-.67-1.5-1.5-1.5S14 7.67 14 8.5s.67 1.5 1.5 1.5S17 9.33 17 8.5zM20 2h-7v2h7v7h2V4c0-1.1-.9-2-2-2zm0 18h-7v2h7c1.1 0 2-.9 2-2v-7h-2v7zM4 13H2v7c0 1.1.9 2 2 2h7v-2H4v-7z"></path></g>
-</if>
 <if expr="not chromeos">
       <g id="web"><path d="M20 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm-5 14H4v-4h11v4zm0-5H4V9h11v4zm5 5h-4V9h4v9z"></path></g>
 </if>