Chromium Code Reviews| Index: Source/devtools/front_end/components/DockController.js |
| diff --git a/Source/devtools/front_end/components/DockController.js b/Source/devtools/front_end/components/DockController.js |
| index 89903d2c940d4c23842bf939e9faec3165701734..5c940a0221284f8ed18f14c6c4de9561e9ffeccb 100644 |
| --- a/Source/devtools/front_end/components/DockController.js |
| +++ b/Source/devtools/front_end/components/DockController.js |
| @@ -44,19 +44,6 @@ WebInspector.DockController = function(canDock) |
| WebInspector.settings.currentDockState = WebInspector.settings.createSetting("currentDockState", ""); |
| WebInspector.settings.lastDockState = WebInspector.settings.createSetting("lastDockState", ""); |
| - var states = [WebInspector.DockController.State.DockedToBottom, WebInspector.DockController.State.Undocked, WebInspector.DockController.State.DockedToRight]; |
| - var titles = [WebInspector.UIString("Dock to main window."), WebInspector.UIString("Undock into separate window."), WebInspector.UIString("Dock to main window.")]; |
| - if (WebInspector.experimentsSettings.dockToLeft.isEnabled()) { |
| - states.push(WebInspector.DockController.State.DockedToLeft); |
| - titles.push(WebInspector.UIString("Dock to main window.")); |
| - } |
| - this._dockToggleButton = new WebInspector.StatusBarStatesSettingButton( |
| - "dock-status-bar-item", |
| - states, |
| - titles, |
| - WebInspector.settings.currentDockState, |
| - WebInspector.settings.lastDockState, |
| - this._dockSideChanged.bind(this)); |
| } |
| WebInspector.DockController.State = { |
| @@ -78,16 +65,18 @@ WebInspector.DockController.Events = { |
| WebInspector.DockController.prototype = { |
| initialize: function() |
| { |
| - if (this._canDock) |
| - this._dockToggleButton.toggleInitialState(); |
| - }, |
| + if (!this._canDock) |
| + return; |
| - /** |
| - * @return {?Element} |
| - */ |
| - get element() |
| - { |
| - return this._canDock ? this._dockToggleButton.element : null; |
| + this._states = [WebInspector.DockController.State.DockedToBottom, WebInspector.DockController.State.Undocked, WebInspector.DockController.State.DockedToRight]; |
| + this._titles = [WebInspector.UIString("Dock to main window."), WebInspector.UIString("Undock into separate window."), WebInspector.UIString("Dock to main window.")]; |
| + if (WebInspector.experimentsSettings.dockToLeft.isEnabled()) { |
| + this._states.push(WebInspector.DockController.State.DockedToLeft); |
| + this._titles.push(WebInspector.UIString("Dock to main window.")); |
| + } |
| + var initialState = WebInspector.settings.currentDockState.get(); |
| + initialState = this._states.indexOf(initialState) >= 0 ? initialState : this._states[0]; |
| + this._dockSideChanged(initialState); |
| }, |
| /** |
| @@ -169,6 +158,37 @@ WebInspector.DockController.prototype = { |
| } |
| /** |
| + * @constructor |
| + * @implements {WebInspector.StatusBarButton.Provider} |
| + */ |
| +WebInspector.DockController.ButtonProvider = function() |
| +{ |
| +} |
| + |
| +WebInspector.DockController.ButtonProvider.prototype = { |
| + /** |
| + * @return {?WebInspector.StatusBarButton} |
| + */ |
| + button: function() |
| + { |
| + if (!WebInspector.dockController.canDock()) |
| + return null; |
| + |
| + if (!this._dockToggleButton) { |
| + this._dockToggleButton = new WebInspector.StatusBarStatesSettingButton( |
| + "dock-status-bar-item", |
| + WebInspector.dockController._states, |
|
yurys
2014/06/02 15:48:19
Why do you prefer to store stats and titles in fie
apavlov
2014/06/03 08:39:08
It's because these depend on the inspected environ
apavlov
2014/06/03 09:16:41
Another point is that line 79, this._dockSideChang
|
| + WebInspector.dockController._titles, |
| + WebInspector.dockController.dockSide(), |
| + WebInspector.settings.currentDockState, |
| + WebInspector.settings.lastDockState, |
| + WebInspector.dockController._dockSideChanged.bind(WebInspector.dockController)); |
| + } |
| + return this._dockToggleButton; |
| + } |
| +} |
| + |
| +/** |
| * @type {!WebInspector.DockController} |
| */ |
| WebInspector.dockController; |