Merge pull request #533 from petetnt/master

Add --disable-default-apps-flag for live preview
adobe · Sep 12, 2015 · e5e2643 · e5e2643
2 parents 74861bd + 98a2fd8
commit e5e2643
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/appshell/appshell_extensions_gtk.cpp b/appshell/appshell_extensions_gtk.cpp
@@ -63,7 +63,7 @@ int GErrorToErrorCode(GError *gerror) {
 
 int32 OpenLiveBrowser(ExtensionString argURL, bool enableRemoteDebugging)
 {
-    const char *remoteDebuggingFormat = "--no-first-run --no-default-browser-check --allow-file-access-from-files --temp-profile --user-data-dir=%s --remote-debugging-port=9222";
+    const char *remoteDebuggingFormat = "--no-first-run --no-default-browser-check --disable-default-apps --allow-file-access-from-files --temp-profile --user-data-dir=%s --remote-debugging-port=9222";
     gchar *remoteDebugging;
     gchar *cmdline;
     int error = ERR_BROWSER_NOT_INSTALLED;

diff --git a/appshell/appshell_extensions_mac.mm b/appshell/appshell_extensions_mac.mm
@@ -257,6 +257,7 @@ int32 OpenLiveBrowser(ExtensionString argURL, bool enableRemoteDebugging)
         NSArray *parameters = [NSArray arrayWithObjects:
                       @"--no-first-run",
                       @"--no-default-browser-check",
+                      @"--disable-default-apps",
                       debugPortCommandlineArguments,
                       debugProfilePath,
                       urlString,

diff --git a/appshell/appshell_extensions_win.cpp b/appshell/appshell_extensions_win.cpp
@@ -341,7 +341,7 @@ int32 OpenLiveBrowser(ExtensionString argURL, bool enableRemoteDebugging)
         profilePath += L"\\live-dev-profile";
         args += L" --user-data-dir=\"";
         args += profilePath;
-        args += L"\" --no-first-run --no-default-browser-check --allow-file-access-from-files --remote-debugging-port=9222 ";
+        args += L"\" --no-first-run --no-default-browser-check --disable-default-apps --allow-file-access-from-files --remote-debugging-port=9222 ";
     } else {
         args += L" ";
     }