CUPS: Remove the unwanted line in Edit printer dialog.

Only the Edit printer dialog needs the scrollable behavior.

Bug: 851903
Change-Id: I31ed7430b7caf1a6fcd878e732e3206868f40e79
Reviewed-on: https://chromium-review.googlesource.com/1168151Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
Commit-Queue: Xiaoqian Dai <xdai@chromium.org>
Cr-Commit-Position: refs/heads/master@{#582471}

chrome/browser/resources/settings/printing_page/BUILD.gn

@@ -37,13 +37,13 @@ js_library("cups_add_printer_dialog") {
 js_library("cups_add_printer_dialog_util") {
   deps = [
     ":cups_printers_browser_proxy",
-    "//ui/webui/resources/cr_elements:cr_scrollable_behavior",
   ]
 }
 
 js_library("cups_edit_printer_dialog") {
   deps = [
     ":cups_set_manufacturer_model_behavior",
+    "//ui/webui/resources/cr_elements:cr_scrollable_behavior",
   ]
 }
 

chrome/browser/resources/settings/printing_page/cups_add_printer_dialog_util.html

 <link rel="import" href="chrome://resources/html/polymer.html">
 
 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.html">
 <link rel="import" href="chrome://resources/cr_elements/icons.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
 <link rel="import" href="cups_printer_shared_css.html">
@@ -47,7 +46,7 @@
       <div slot="title">
         <slot name="dialog-title"></slot>
       </div>
-      <div slot="body" scrollable>
+      <div slot="body">
         <slot name="dialog-body"></slot>
       </div>
       <div slot="button-container">

chrome/browser/resources/settings/printing_page/cups_add_printer_dialog_util.js

@@ -33,10 +33,6 @@ Polymer({
 Polymer({
   is: 'add-printer-dialog',
 
-  behaviors: [
-    CrScrollableBehavior,
-  ],
-
   /** @private */
   attached: function() {
     this.$.dialog.showModal();

chrome/browser/resources/settings/printing_page/cups_edit_printer_dialog.html

 <link rel="import" href="chrome://resources/html/polymer.html">
 
 <link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html">
+<link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
 <link rel="import" href="cups_add_printer_dialog_util.html">
 <link rel="import" href="cups_printer_shared_css.html">
@@ -20,7 +21,7 @@
     </style>
     <add-printer-dialog>
       <div slot="dialog-title">$i18n{editPrinterDialogTitle}</div>
-      <div slot="dialog-body">
+      <div slot="dialog-body" scrollable>
         <div class="settings-box first two-line">
           <cr-input class="printer-name-input" autofocus
               value="{{activePrinter.printerName}}"

chrome/browser/resources/settings/printing_page/cups_edit_printer_dialog.js

@@ -11,6 +11,7 @@ Polymer({
   is: 'settings-cups-edit-printer-dialog',
 
   behaviors: [
+    CrScrollableBehavior,
     SetManufacturerModelBehavior,
   ],