diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-06-28 16:19:27 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-06-28 16:19:27 -0400 |
| commit | f47536f5706b036aa410636b74e1a96b1d58430a (patch) | |
| tree | 26c4cbe2254af17c16ba9fc38bde7870656db216 /devtools | |
| parent | ee4ef87724fda6c474e7e69b519acd58a574679d (diff) | |
| parent | 7664308ab16560fc25622ef68810300233d39fa9 (diff) | |
| download | UXP-f47536f5706b036aa410636b74e1a96b1d58430a.tar UXP-f47536f5706b036aa410636b74e1a96b1d58430a.tar.gz UXP-f47536f5706b036aa410636b74e1a96b1d58430a.tar.lz UXP-f47536f5706b036aa410636b74e1a96b1d58430a.tar.xz UXP-f47536f5706b036aa410636b74e1a96b1d58430a.zip | |
Merge branch 'define-work'
Diffstat (limited to 'devtools')
| -rw-r--r-- | devtools/client/framework/devtools-browser.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/devtools/client/framework/devtools-browser.js b/devtools/client/framework/devtools-browser.js index f032f82aa..4d7176b4c 100644 --- a/devtools/client/framework/devtools-browser.js +++ b/devtools/client/framework/devtools-browser.js @@ -28,7 +28,7 @@ loader.lazyRequireGetter(this, "DebuggerClient", "devtools/shared/client/main", loader.lazyRequireGetter(this, "BrowserMenus", "devtools/client/framework/browser-menus"); loader.lazyImporter(this, "AppConstants", "resource://gre/modules/AppConstants.jsm"); -#ifdef MC_BASILISK +#ifdef MOZ_AUSTRALIS loader.lazyImporter(this, "CustomizableUI", "resource:///modules/CustomizableUI.jsm"); #endif @@ -335,7 +335,7 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = { * Install Developer widget */ installDeveloperWidget: function () { -#ifdef MC_BASILISK +#ifdef MOZ_AUSTRALIS let id = "developer-button"; let widget = CustomizableUI.getWidget(id); if (widget && widget.provider == CustomizableUI.PROVIDER_API) { @@ -394,7 +394,7 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = { */ // Used by itself installWebIDEWidget: function () { -#ifdef MC_BASILISK +#ifdef MOZ_AUSTRALIS if (this.isWebIDEWidgetInstalled()) { return; } @@ -422,7 +422,7 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = { }, isWebIDEWidgetInstalled: function () { -#ifdef MC_BASILISK +#ifdef MOZ_AUSTRALIS let widgetWrapper = CustomizableUI.getWidget("webide-button"); return !!(widgetWrapper && widgetWrapper.provider == CustomizableUI.PROVIDER_API); #else @@ -439,7 +439,7 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = { * Uninstall WebIDE widget */ uninstallWebIDEWidget: function () { -#ifdef MC_BASILISK +#ifdef MOZ_AUSTRALIS if (this.isWebIDEWidgetInstalled()) { CustomizableUI.removeWidgetFromArea("webide-button"); } @@ -454,7 +454,7 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = { */ // Used by webide.js moveWebIDEWidgetInNavbar: function () { -#ifdef MC_BASILISK +#ifdef MOZ_AUSTRALIS CustomizableUI.addWidgetToArea("webide-button", CustomizableUI.AREA_NAVBAR); #else return; |