Merge 199418 "Fix wrapping window decoration buttons in the File..."

chrome/browser/resources/file_manager/js/file_manager.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 'use strict';
 
 /**
  * This variable is checked in SelectFileDialogExtensionBrowserTest.
  * @type {number}
  */
@@ skipping 842 matching lines @@
         this.onTaskItemClicked_.bind(this));
 
     this.dialogDom_.ownerDocument.defaultView.addEventListener(
         'resize', this.onResize_.bind(this));
 
     if (loadTimeData.getBoolean('ASH'))
       this.dialogDom_.setAttribute('ash', 'true');
 
     this.filePopup_ = null;
 
+    this.searchBoxWrapper_ =
+        this.dialogDom_.querySelector('.search-box-wrapper');
     this.searchBox_ = this.dialogDom_.querySelector('#search-box');
     this.searchBox_.addEventListener(
         'input', this.onSearchBoxUpdate_.bind(this));
     this.lastSearchQuery_ = '';
 
     var autocompleteList = new cr.ui.AutocompleteList();
     autocompleteList.id = 'autocomplete-list';
     autocompleteList.autoExpands = true;
     autocompleteList.requestSuggestions =
         this.requestAutocompleteSuggestions_.bind(this);
@@ skipping 550 matching lines @@
         if (this.table_.clientWidth > 0)
           this.table_.normalizeColumns();
       }
       this.table_.redraw();
       this.volumeList_.redraw();
     }
 
     if (!util.platform.newUI())
       this.breadcrumbs_.truncate();
 
+    // Hide the search box if there is not enough space.
+    if (util.platform.newUI())
+      this.searchBox_.hidden = this.searchBoxWrapper_.clientWidth < 100;
+
     this.searchBreadcrumbs_.truncate();
 
     this.updateWindowState_();
   };
 
   /**
    * @private
    */
   FileManager.prototype.updateWindowState_ = function() {
     util.platform.getWindowStatus(function(wnd) {
@@ skipping 2206 matching lines @@
    * Set the flag expressing whether the ctrl key is pressed or not.
    * @param {boolean} flag New value of the flag
    * @private
    */
   FileManager.prototype.setCtrlKeyPressed_ = function(flag) {
     this.ctrlKeyPressed_ = flag;
     this.document_.querySelector('#drive-clear-local-cache').canExecuteChange();
     this.document_.querySelector('#drive-reload').canExecuteChange();
   };
 })();