diff options
| author | zvorygin@chromium.org <zvorygin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-05 14:24:32 +0000 |
|---|---|---|
| committer | zvorygin@chromium.org <zvorygin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-05 14:24:32 +0000 |
| commit | 196d33978ee521ec66916314547aae16d90a00bc (patch) | |
| tree | 28418351f481a336fe831987cb4b8fecc4a8ba52 | |
| parent | 94b7588beb911c4584c87c2ff68407705d479b21 (diff) | |
| download | chromium_src-196d33978ee521ec66916314547aae16d90a00bc.zip chromium_src-196d33978ee521ec66916314547aae16d90a00bc.tar.gz chromium_src-196d33978ee521ec66916314547aae16d90a00bc.tar.bz2 | |
[FileBrowser] Added room for aura on-window controls in macimized state.
BUG=145888
Review URL: https://chromiumcodereview.appspot.com/11036034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160365 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/resources/file_manager/css/file_manager.css | 4 | ||||
| -rw-r--r-- | chrome/browser/resources/file_manager/js/file_manager.js | 14 |
2 files changed, 18 insertions, 0 deletions
diff --git a/chrome/browser/resources/file_manager/css/file_manager.css b/chrome/browser/resources/file_manager/css/file_manager.css index 0f81691..72e990e 100644 --- a/chrome/browser/resources/file_manager/css/file_manager.css +++ b/chrome/browser/resources/file_manager/css/file_manager.css @@ -341,6 +341,10 @@ div.root-eject:hover { margin-top: 5px; } +[maximized] .dialog-header { + -webkit-padding-end: 70px; +} + /* Container for the detail and thumbnail list views. */ .dialog-body { -webkit-box-flex: 1; diff --git a/chrome/browser/resources/file_manager/js/file_manager.js b/chrome/browser/resources/file_manager/js/file_manager.js index 5ef13c3..31305e5 100644 --- a/chrome/browser/resources/file_manager/js/file_manager.js +++ b/chrome/browser/resources/file_manager/js/file_manager.js @@ -740,6 +740,8 @@ FileManager.prototype = { this.fileTypeSelector_ = this.dialogDom_.querySelector('#file-type'); this.initFileTypeFilter_(); + + this.updateWindowState_(); // Populate the static localized strings. i18nTemplate.process(this.document_, loadTimeData); }; @@ -1226,6 +1228,18 @@ FileManager.prototype = { this.rootsList_.redraw(); this.breadcrumbs_.truncate(); this.searchBreadcrumbs_.truncate(); + + this.updateWindowState_(); + }; + + FileManager.prototype.updateWindowState_ = function() { + chrome.windows.getCurrent(function(wnd) { + if (wnd.state == 'maximized') { + this.dialogDom_.setAttribute('maximized', 'maximized'); + } else { + this.dialogDom_.removeAttribute('maximized'); + } + }.bind(this)); }; FileManager.prototype.resolvePath = function( |