Merge pull request #5997 from adobe/jasonsanjose/revert-mac-chrome-sp…

…rint34 Revert changes to Chrome live preview on mac for sprint 34
adobe · Nov 14, 2013 · 30eccd5 · 30eccd5
2 parents e6f23f0 + 96948d9
commit 30eccd5
Showing 1 changed file with 4 additions and 25 deletions.
diff --git a/src/LiveDevelopment/LiveDevelopment.js b/src/LiveDevelopment/LiveDevelopment.js
@@ -798,19 +798,8 @@ define(function LiveDevelopment(require, exports, module) {
          * the status accordingly.
          */
         function cleanup() {
-            // Need to do this in order to trigger the corresponding CloseLiveBrowser cleanups required on 
-            // the native Mac side
-            var closeDeferred = (brackets.platform === "mac") ? NativeApp.closeLiveBrowser() : $.Deferred().resolve();
-            closeDeferred.done(function () {
-                _setStatus(STATUS_INACTIVE, reason || "explicit_close");
-                deferred.resolve();
-            }).fail(function (err) {
-                if (err) {
-                    reason +=  " (" + err + ")";
-                }
-                _setStatus(STATUS_INACTIVE, reason || "explicit_close");
-                deferred.resolve();
-            });
+            _setStatus(STATUS_INACTIVE, reason || "explicit_close");
+            deferred.resolve();
         }
 
         if (_openDeferred) {
@@ -1044,7 +1033,7 @@ define(function LiveDevelopment(require, exports, module) {
                     if (id === Dialogs.DIALOG_BTN_OK) {
                         // User has chosen to reload Chrome, quit the running instance
                         _setStatus(STATUS_INACTIVE);
-                        _close()
+                        NativeApp.closeLiveBrowser()
                             .done(function () {
                                 browserStarted = false;
                                 window.setTimeout(function () {
@@ -1059,17 +1048,7 @@ define(function LiveDevelopment(require, exports, module) {
                                 _openDeferred.reject("CLOSE_LIVE_BROWSER");
                             });
                     } else {
-                        _close()
-                            .done(function () {
-                                browserStarted = false;
-                                _openDeferred.reject("CANCEL");
-                            })
-                            .fail(function (err) {
-                                // Report error?
-                                _setStatus(STATUS_ERROR);
-                                browserStarted = false;
-                                _openDeferred.reject("CLOSE_LIVE_BROWSER");
-                            });
+                        _openDeferred.reject("CANCEL");
                     }
                 });