[site settings] swap action menu and subpage arrow

chrome/browser/resources/settings/site_settings/site_list.html

 <link rel="import" href="chrome://resources/html/polymer.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_action_menu/cr_action_menu.html">
 <link rel="import" href="chrome://resources/cr_elements/icons.html">
 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_indicator.html">
 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html">
 <link rel="import" href="../i18n_setup.html">
 <link rel="import" href="../icons.html">
 <link rel="import" href="../route.html">
 <link rel="import" href="../settings_shared_css.html">
 <link rel="import" href="add_site_dialog.html">
 <link rel="import" href="constants.html">
 <link rel="import" href="edit_exception_dialog.html">
 <link rel="import" href="site_settings_behavior.html">
 <link rel="import" href="site_settings_prefs_browser_proxy.html">
 
 <dom-module id="site-list">
   <template>
     <style include="settings-shared">
-      paper-icon-button {
-        left: 8px;
-        right: 8px;
-      }
-
       .selectable {
         -webkit-user-select: text;
       }
     </style>
     <div id="category">
       <div class="settings-box first" hidden$="[[allSites]]">
         <h2 class="start">[[categoryHeader]]</h2>
         <paper-button id="addSite"
             class="secondary-button header-aligned-button"
             hidden="[[readOnlyList]]" on-tap="onAddSiteTap_">
@@ skipping 23 matching lines @@
             on-tap="onResetTap_">
           $i18n{siteSettingsActionReset}
         </button>
       </dialog>
 
       <div class="list-frame" hidden$="[[hasSites_(sites)]]">
         <div class="list-item secondary">$i18n{noSitesAdded}</div>
       </div>
       <div class="list-frame menu-content vertical-list" id="listContainer">
         <template is="dom-repeat" items="[[sites]]">
-          <div class="list-item" actionable$="[[enableSiteSettings_]]"
-              on-tap="onOriginTap_">
-            <div class="favicon-image"
-                style$="[[computeSiteIcon(item.origin)]]">
-            </div>
-            <div class="middle no-min-width">
-              <div class="selectable text-elide">[[item.displayName]]</div>
+          <div class="list-item">
+            <div class="layout horizontal center flex"
+                actionable$="[[enableSiteSettings_]]" on-tap="onOriginTap_">
+              <div class="favicon-image"
+                  style$="[[computeSiteIcon(item.origin)]]">
+              </div>
+              <div class="middle no-min-width">
+                <div class="selectable text-elide">[[item.displayName]]</div>
 
-              <!-- This div must not contain extra whitespace. -->
-              <div class="selectable secondary text-elide" id="siteDescription"
-                  >[[computeSiteDescription_(item)]]</div>
+                <!-- This div must not contain extra whitespace. -->
+                <div class="selectable secondary text-elide"
+                    id="siteDescription">[[computeSiteDescription_(item)]]</div>
+              </div>
+              <template is="dom-if" if="[[enableSiteSettings_]]">
+                <div on-tap="onOriginTap_" actionable>
+                  <button class="subpage-arrow" is="paper-icon-button-light"
+                      aria-label$="[[item.displayName]]"
+                      aria-describedby="siteDescription"></button>
+                </div>
+                <!-- This div is intentionally empty. It creates a vertical grey
+                     bar. This can be merged into the html that follows this
+                     template after the |enableSiteSettings_| is removed. -->
+                <div class="secondary-action"></div>
+              </template>
             </div>
             <template is="dom-if" if="[[item.controlledBy]]">
               <cr-policy-pref-indicator pref="[[item]]"
                   icon-aria-label="[[label]]">
               </cr-policy-pref-indicator>
             </template>
 
             <paper-icon-button id="resetSite" icon="cr:delete"
                 hidden="[[isResetButtonHidden_(
                     item.enforcement, readOnlyList)]]"
-                on-tap="onResetButtonTap_" alt="$i18n{siteSettingsActionReset}">
+                on-tap="onResetButtonTap_"
+                alt="$i18n{siteSettingsActionReset}">
             </paper-icon-button>
             <paper-icon-button id="actionMenuButton" icon="cr:more-vert"
-                hidden="[[isActionMenuHidden_(item.enforcement, readOnlyList)]]"
+                hidden=
+                    "[[isActionMenuHidden_(item.enforcement, readOnlyList)]]"
                 on-tap="onShowActionMenuTap_" title="$i18n{moreActions}">
             </paper-icon-button>
-            <template is="dom-if" if="[[enableSiteSettings_]]">
-              <div on-tap="onOriginTap_" actionable>
-                <button class="subpage-arrow" is="paper-icon-button-light"
-                    aria-label$="[[item.displayName]]"
-                    aria-describedby="siteDescription"></button>
-              </div>
-            </template>
           </div>
         </template>
       </div>
     </div>
     <template is="dom-if" if="[[showEditExceptionDialog_]]" restamp>
       <settings-edit-exception-dialog model="[[actionMenuSite_]]"
           on-close="onEditExceptionDialogClosed_">
       </settings-edit-exception-dialog>
     </template>
   </template>
   <script src="site_list.js"></script>
 </dom-module>