Merge remote-tracking branch 'ninja-internal/master' into Timeline-local

Conflicts:
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js

1 files changed, 7 insertions, 2 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index fa611de4..1c9d9d59 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -84,8 +84,13 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         //
     handleAppLoaded: {
         value: function() {
-            //Adding an intercept to resources loaded to ensure user assets load from cloud simulator
-            if (window.chrome.app.isInstalled) {
+            //Checking for app to be loaded through extension
+            var check;
+            if (chrome && chrome.app) {
+                check = chrome.app.getDetails();
+            }
+            if (check !== null) {
+                //Adding an intercept to resources loaded to ensure user assets load from cloud simulator
                 chrome.webRequest.onBeforeRequest.addListener(this.handleWebRequest.bind(this), {urls: ["<all_urls>"]}, ["blocking"]);
             }
         }