Merge pull request #533 from petetnt/master

Marcel Gerber · Marcel Gerber · commit e5e264355c9a · 2015-09-12T21:16:08.000+02:00
Add --disable-default-apps-flag for live preview
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" ";
     }

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ int GErrorToErrorCode(GError *gerror) {`
`63`	`63`
`64`	`64`	`int32 OpenLiveBrowser(ExtensionString argURL, bool enableRemoteDebugging)`
`65`	`65`	`{`
`66`		`- 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";`
	`66`	`+ 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";`
`67`	`67`	`gchar *remoteDebugging;`
`68`	`68`	`gchar *cmdline;`
`69`	`69`	`int error = ERR_BROWSER_NOT_INSTALLED;`
Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ int32 OpenLiveBrowser(ExtensionString argURL, bool enableRemoteDebugging)`
`341`	`341`	`profilePath += L"\\live-dev-profile";`
`342`	`342`	`args += L" --user-data-dir=\"";`
`343`	`343`	`args += profilePath;`
`344`		`- args += L"\" --no-first-run --no-default-browser-check --allow-file-access-from-files --remote-debugging-port=9222 ";`
	`344`	`+ args += L"\" --no-first-run --no-default-browser-check --disable-default-apps --allow-file-access-from-files --remote-debugging-port=9222 ";`
`345`	`345`	`} else {`
`346`	`346`	`args += L" ";`
`347`	`347`	`}`