MD Settings: Google Play Store: Add subpage and polish (Take 2)

chrome/browser/resources/settings/android_apps_page/android_apps_subpage.html

Index: chrome/browser/resources/settings/android_apps_page/android_apps_subpage.html
diff --git a/chrome/browser/resources/settings/android_apps_page/android_apps_page.html b/chrome/browser/resources/settings/android_apps_page/android_apps_subpage.html
similarity index 58%
copy from chrome/browser/resources/settings/android_apps_page/android_apps_page.html
copy to chrome/browser/resources/settings/android_apps_page/android_apps_subpage.html
index e8bbd3cab2021d1db80b93546f07e5cc7a34bb2e..11639d6bbcfffa2158cfc47cb215accd23ffb280 100644
--- a/chrome/browser/resources/settings/android_apps_page/android_apps_page.html
+++ b/chrome/browser/resources/settings/android_apps_page/android_apps_subpage.html
@@ -2,37 +2,15 @@
 <link rel="import" href="chrome://resources/html/polymer.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
 <link rel="import" href="android_apps_browser_proxy.html">
-<link rel="import" href="../controls/settings_toggle_button.html">
 <link rel="import" href="../i18n_setup.html">
 <link rel="import" href="../prefs/prefs_behavior.html">
 <link rel="import" href="../settings_shared_css.html">
 
-<dom-module id="settings-android-apps-page">
+<dom-module id="settings-android-apps-subpage">
   <template>
-    <style include="settings-shared">
-      a {
-        -webkit-margin-start: 4px;
-      }
+    <style include="settings-shared"></style>
 
-      .indented {
-        -webkit-margin-start: var(--settings-indent-width);
-      }
-    </style>
-
-    <div class="settings-box first">
-      <settings-toggle-button id="enabled" class="start"
-          pref="{{prefs.arc.enabled}}"
-          label="$i18n{androidAppsEnabled}"
-          on-settings-boolean-control-change="onArcEnabledChange_"
-          no-set-pref>
-        <a href="$i18nRaw{androidAppsLearnMoreUrl}" target="_blank"
-            class="more-actions" on-tap="stopPropagation_">
-          $i18n{androidAppsLearnMore}
-        </a>
-      </settings-toggle-button>
-    </div>
-
-    <div id="manageApps" class="settings-box continuation indented"
+    <div id="manageApps" class="settings-box first"
         on-keydown="onManageAndroidAppsKeydown_"
         on-tap="onManageAndroidAppsTap_" actionable
         hidden="[[!androidAppsInfo_.appReady]]">
@@ -43,11 +21,20 @@
       </button>
     </div>
 
+    <template is="dom-if" if="[[allowRemove_(prefs.arc.enabled.*)]]">
+      <div id="remove" class="settings-box" actionable on-tap="onRemoveTap_">
+        <div class="start">$i18n{androidAppsRemove}</div>
+        <button class="subpage-arrow" is="paper-icon-button-light"
+            aria-label="$i18n{androidAppsRemove}">
+        </button>
+      </div>
+    </template>
+
     <!-- Confirm disable android apps dialog -->
     <dialog is="cr-dialog" id="confirmDisableDialog" close-text="$i18n{close}"
         on-cancel="onConfirmDisableDialogCancel_">
       <div class="title">$i18n{androidAppsDisableDialogTitle}</div>
-      <div class="body" inner-h-t-m-l="[[getDialogBody_()]]"></div>
+      <div class="body" inner-h-t-m-l="[[dialogBody_]]"></div>
       <div class="button-container">
         <paper-button class="cancel-button"
             on-tap="onConfirmDisableDialogCancel_">
@@ -55,10 +42,11 @@
         </paper-button>
         <paper-button class="action-button"
             on-tap="onConfirmDisableDialogConfirm_">
-          $i18n{confirm}
+          $i18n{androidAppsDisableDialogRemove}
         </paper-button>
       </div>
     </dialog>
+
   </template>
-  <script src="android_apps_page.js"></script>
+  <script src="android_apps_subpage.js"></script>
 </dom-module>