Replace Manage Languages with dialog and dropdown item

chrome/browser/resources/settings/languages_page/languages_page.html

Index: chrome/browser/resources/settings/languages_page/languages_page.html
diff --git a/chrome/browser/resources/settings/languages_page/languages_page.html b/chrome/browser/resources/settings/languages_page/languages_page.html
index 898a69ee61e58047b0ec05f7f74bc9e8e3fb9d02..26f7271e9402aa37104ee6948e6e7af093fa4858 100644
--- a/chrome/browser/resources/settings/languages_page/languages_page.html
+++ b/chrome/browser/resources/settings/languages_page/languages_page.html
@@ -13,9 +13,9 @@
 <link rel="import" href="/settings_page/settings_animated_pages.html">
 <link rel="import" href="/settings_page/settings_subpage.html">
 <link rel="import" href="/settings_shared_css.html">
+<link rel="import" href="add_languages_dialog.html">
 <link rel="import" href="language_detail_page.html">
 <link rel="import" href="languages.html">
-<link rel="import" href="manage_languages_page.html">
 
 <if expr="not is_macosx">
 <link rel="import" href="edit_dictionary_page.html">
@@ -37,8 +37,7 @@
     </settings-languages>
     <settings-animated-pages id="pages" section="languages">
       <neon-animatable route-path="default">
-        <div id="manage-languages-subpage-trigger"
-            class="settings-box first two-line">
+        <div class="settings-box first two-line">
           <div class="start">
             <div>$i18n{languagesListTitle}</div>
             <div class="secondary">
@@ -104,12 +103,17 @@
                         on-tap="onShowLanguageDetailTap_">
                       $i18n{languageDetail}
                     </button>
+                    <button class="dropdown-item" role="option"
+                        on-tap="onRemoveLanguageTap_"
+                        disabled="[[!item.removable]]">
+                      $i18n{removeLanguage}
+                    </button>
                   </div>
                 </iron-dropdown>
               </div>
             </template>
-            <div class="list-item list-button" on-tap="onManageLanguagesTap_">
-              $i18n{manageLanguages}
+            <div class="list-item list-button" on-tap="onAddLanguagesTap_">
+              $i18n{addLanguages}
             </div>
           </div>
         </iron-collapse>
@@ -190,16 +194,6 @@
         </iron-collapse>
 </if>
       </neon-animatable>
-      <template is="dom-if" route-path="/manageLanguages">
-        <settings-subpage
-            associated-control="[[$$('#manage-languages-subpage-trigger')]]"
-            page-title="$i18n{manageLanguagesPageTitle}">
-          <settings-manage-languages-page
-              languages="{{languages}}" prefs="{{prefs}}"
-              language-helper="[[languageHelper]]">
-          </settings-manage-languages-page>
-        </settings-subpage>
-      </template>
       <template is="dom-if" route-path="/languages/edit" no-search>
         <settings-subpage page-title="[[detailLanguage_.language.displayName]]">
           <settings-language-detail-page id="languageDetailPage"
@@ -229,6 +223,11 @@
       </template>
 </if>
     </settings-animated-pages>
+    <template is="dom-if" if="[[showAddLanguagesDialog_]]" restamp>
+      <settings-add-languages-dialog languages="{{languages}}"
+          prefs="{{prefs}}" language-helper="[[languageHelper]]">
+      </settings-add-languages-dialog>
+    </template>
   </template>
   <script src="languages_page.js"></script>
 </dom-module>