Commit 3aeb2827 authored by hirono@chromium.org's avatar hirono@chromium.org

Files.app: Remove the ButterBar class.

BatterBar is replaced with new ProgressCenter class. This is no longer
needed. This CL removes the ButterBar class, HTML elements and CSS styles.

BUG=318931
TEST=manually
R=yoshiki@chromium.org

Review URL: https://codereview.chromium.org/98213003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238333 0039d316-1c4b-4281-b951-d872f2087c98
parent 636e7ace
...@@ -100,67 +100,6 @@ body { ...@@ -100,67 +100,6 @@ body {
opacity: 0.5; opacity: 0.5;
} }
#butter-bar-container {
width: 100%;
}
#butter-bar {
color: #666;
display: -webkit-box;
padding: 15px;
}
#butter-bar:not(.visible) {
display: none;
}
#butter-bar .content {
-webkit-box-flex: 1.0;
-webkit-box-orient: block-axis;
-webkit-box-pack: end;
display: -webkit-box;
}
#butter-bar .actions {
-webkit-box-align: end;
-webkit-box-orient: horizontal;
-webkit-box-pack: end;
-webkit-margin-start: 6px;
display: -webkit-box;
}
#butter-bar .actions a {
color: rgb(17, 85, 204);
cursor: pointer;
vertical-align: middle;
}
#butter-bar .actions a.x {
background: center center no-repeat;
background-image: -webkit-image-set(
url('../images/files/ui/close_bar.png') 1x,
url('../images/files/ui/2x/close_bar.png') 2x);
display: inline-block;
height: 35px; /* #butter-bar .content's min-height. */
margin-right: -12px;
width: 35px;
}
#butter-bar .actions a.x:first-child {
margin-left: -6px;
}
#butter-bar .actions a.x {
margin-bottom: -14px;
}
#butter-bar .butter-message.single-line {
line-height: 2.0;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
/* Main part of the dialog between header and footer. */ /* Main part of the dialog between header and footer. */
.dialog-container { .dialog-container {
-webkit-box-align: stretch; -webkit-box-align: stretch;
......
...@@ -384,10 +384,7 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52; ...@@ -384,10 +384,7 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
this.fileOperationManager_ = FileOperationManagerWrapper.getInstance( this.fileOperationManager_ = FileOperationManagerWrapper.getInstance(
this.backgroundPage_); this.backgroundPage_);
this.butterBar_ = new ButterBar( // CopyManager are required for 'Delete' operation in
this.dialogDom_, this.fileOperationManager_);
// CopyManager and ButterBar are required for 'Delete' operation in
// Open and Save dialogs. But drag-n-drop and copy-paste are not needed. // Open and Save dialogs. But drag-n-drop and copy-paste are not needed.
if (this.dialogType != DialogType.FULL_PAGE) return; if (this.dialogType != DialogType.FULL_PAGE) return;
...@@ -2333,8 +2330,6 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52; ...@@ -2333,8 +2330,6 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
this.filePopup_.contentWindow && this.filePopup_.contentWindow &&
this.filePopup_.contentWindow.unload) this.filePopup_.contentWindow.unload)
this.filePopup_.contentWindow.unload(true /* exiting */); this.filePopup_.contentWindow.unload(true /* exiting */);
if (this.butterBar_)
this.butterBar_.dispose();
if (this.progressCenterPanel_) if (this.progressCenterPanel_)
this.backgroundPage_.background.progressCenter.removePanel( this.backgroundPage_.background.progressCenter.removePanel(
this.progressCenterPanel_); this.progressCenterPanel_);
......
...@@ -79,7 +79,6 @@ ...@@ -79,7 +79,6 @@
//<include src="ui/file_manager_dialog_base.js"/> //<include src="ui/file_manager_dialog_base.js"/>
// //
//<include src="app_installer.js"/> //<include src="app_installer.js"/>
//<include src="butter_bar.js"/>
//<include src="cws_container_client.js"/> //<include src="cws_container_client.js"/>
//<include src="directory_contents.js"/> //<include src="directory_contents.js"/>
//<include src="directory_model.js"/> //<include src="directory_model.js"/>
......
...@@ -44,15 +44,6 @@ var ProgressCenterPanel = function(element) { ...@@ -44,15 +44,6 @@ var ProgressCenterPanel = function(element) {
'webkitTransitionEnd', this.onItemTransitionEnd_.bind(this)); 'webkitTransitionEnd', this.onItemTransitionEnd_.bind(this));
}; };
/**
* Whether to use the new progress center UI or not.
* TODO(hirono): Remove the flag after replacing the old butter bar with the new
* progress center.
* @type {boolean}
* @private
*/
ProgressCenterPanel.ENABLED_ = true;
/** /**
* Updates attributes of the item element. * Updates attributes of the item element.
* @param {!HTMLElement} element Element to be updated. * @param {!HTMLElement} element Element to be updated.
......
...@@ -92,7 +92,6 @@ ...@@ -92,7 +92,6 @@
<script src="foreground/js/ui/file_manager_dialog_base.js"></script> <script src="foreground/js/ui/file_manager_dialog_base.js"></script>
<script src="foreground/js/app_installer.js"></script> <script src="foreground/js/app_installer.js"></script>
<script src="foreground/js/butter_bar.js"></script>
<script src="foreground/js/cws_container_client.js"></script> <script src="foreground/js/cws_container_client.js"></script>
<script src="foreground/js/directory_contents.js"></script> <script src="foreground/js/directory_contents.js"></script>
<script src="foreground/js/directory_model.js"></script> <script src="foreground/js/directory_model.js"></script>
...@@ -281,7 +280,6 @@ ...@@ -281,7 +280,6 @@
<list id="navigation-list" tabindex="14"></list> <list id="navigation-list" tabindex="14"></list>
</div> </div>
<div class="dialog-navigation-list-footer"> <div class="dialog-navigation-list-footer">
<!-- This progress center is under development and hidden. -->
<div id="progress-center" hidden> <div id="progress-center" hidden>
<div id="progress-center-close-view"> <div id="progress-center-close-view">
<li> <li>
...@@ -296,17 +294,6 @@ ...@@ -296,17 +294,6 @@
</div> </div>
<div id="progress-center-open-view"></div> <div id="progress-center-open-view"></div>
</div> </div>
<div id="butter-bar-container" hidden>
<div id="butter-bar">
<div class="content">
<div class="butter-message"></div>
<div class="progress-bar" hidden>
<div class="progress-track"></div>
</div>
</div>
<div class="actions" hidden></div>
</div>
</div>
</div> </div>
</div> </div>
<div class="splitter" id="navigation-list-splitter"></div> <div class="splitter" id="navigation-list-splitter"></div>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment