| Index: third_party/WebKit/Source/devtools/front_end/main/Main.js
|
| diff --git a/third_party/WebKit/Source/devtools/front_end/main/Main.js b/third_party/WebKit/Source/devtools/front_end/main/Main.js
|
| index 450076b2b0e1dc5ce42811b994805d0d42b27c51..519c5cbd882acf03c35aa1624ec84ab2a4a1f2e2 100644
|
| --- a/third_party/WebKit/Source/devtools/front_end/main/Main.js
|
| +++ b/third_party/WebKit/Source/devtools/front_end/main/Main.js
|
| @@ -144,7 +144,7 @@ Main.Main = class {
|
|
|
| var themeSetting = Common.settings.createSetting('uiTheme', 'default');
|
| UI.initializeUIUtils(document, themeSetting);
|
| - themeSetting.addChangeListener(Components.reload.bind(Components));
|
| + themeSetting.addChangeListener(Main.reload.bind(Components));
|
|
|
| UI.installComponentRootStyles(/** @type {!Element} */ (document.body));
|
|
|
| @@ -162,12 +162,12 @@ Main.Main = class {
|
| SDK.targetManager.addEventListener(
|
| SDK.TargetManager.Events.SuspendStateChanged, this._onSuspendStateChanged.bind(this));
|
|
|
| - Components.shortcutsScreen = new Components.ShortcutsScreen();
|
| + UI.shortcutsScreen = new UI.ShortcutsScreen();
|
| // set order of some sections explicitly
|
| - Components.shortcutsScreen.section(Common.UIString('Elements Panel'));
|
| - Components.shortcutsScreen.section(Common.UIString('Styles Pane'));
|
| - Components.shortcutsScreen.section(Common.UIString('Debugger'));
|
| - Components.shortcutsScreen.section(Common.UIString('Console'));
|
| + UI.shortcutsScreen.section(Common.UIString('Elements Panel'));
|
| + UI.shortcutsScreen.section(Common.UIString('Styles Pane'));
|
| + UI.shortcutsScreen.section(Common.UIString('Debugger'));
|
| + UI.shortcutsScreen.section(Common.UIString('Console'));
|
|
|
| Workspace.fileManager = new Workspace.FileManager();
|
| Workspace.workspace = new Workspace.Workspace();
|
| @@ -187,7 +187,7 @@ Main.Main = class {
|
| new Persistence.Persistence(Workspace.workspace, Bindings.breakpointManager, Workspace.fileSystemMapping);
|
|
|
| new Main.OverlayController();
|
| - new Components.ExecutionContextSelector(SDK.targetManager, UI.context);
|
| + new Main.ExecutionContextSelector(SDK.targetManager, UI.context);
|
| Bindings.blackboxManager = new Bindings.BlackboxManager(Bindings.debuggerWorkspaceBinding);
|
|
|
| new Main.Main.PauseListener();
|
| @@ -199,7 +199,7 @@ Main.Main = class {
|
|
|
| UI.actionRegistry = new UI.ActionRegistry();
|
| UI.shortcutRegistry = new UI.ShortcutRegistry(UI.actionRegistry, document);
|
| - Components.ShortcutsScreen.registerShortcuts();
|
| + UI.ShortcutsScreen.registerShortcuts();
|
| this._registerForwardedShortcuts();
|
| this._registerMessageSinkListener();
|
| new Main.Main.InspectorDomainObserver();
|
| @@ -327,7 +327,7 @@ Main.Main = class {
|
|
|
| _registerShortcuts() {
|
| var shortcut = UI.KeyboardShortcut;
|
| - var section = Components.shortcutsScreen.section(Common.UIString('All Panels'));
|
| + var section = UI.shortcutsScreen.section(Common.UIString('All Panels'));
|
| var keys = [
|
| shortcut.makeDescriptor('[', shortcut.Modifiers.CtrlOrMeta),
|
| shortcut.makeDescriptor(']', shortcut.Modifiers.CtrlOrMeta)
|
| @@ -513,7 +513,7 @@ Main.Main.ReloadActionDelegate = class {
|
| Main.Main._reloadPage(true);
|
| return true;
|
| case 'main.debug-reload':
|
| - Components.reload();
|
| + Main.reload();
|
| return true;
|
| }
|
| return false;
|
|
|