Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(822)

Unified Diff: third_party/WebKit/Source/devtools/scripts/chrome_debug_launcher/launch_chrome.js

Issue 2515903002: DevTools: webui receives document load message upon navigation, even for cross-domain navigations. … (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/devtools/devtools_ui_bindings.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/devtools/scripts/chrome_debug_launcher/launch_chrome.js
diff --git a/third_party/WebKit/Source/devtools/scripts/chrome_debug_launcher/launch_chrome.js b/third_party/WebKit/Source/devtools/scripts/chrome_debug_launcher/launch_chrome.js
index f4eaf688623f9d957b103e5619c2458be78fd116..545c94953c1570a871d8800708118f55ed1058ed 100644
--- a/third_party/WebKit/Source/devtools/scripts/chrome_debug_launcher/launch_chrome.js
+++ b/third_party/WebKit/Source/devtools/scripts/chrome_debug_launcher/launch_chrome.js
@@ -68,10 +68,15 @@ function launchChromeWindows()
function launchChromeMac()
{
- var lsregister = "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Support/lsregister";
- var chromeCanaryPath = shellOutput(`${lsregister} -dump | grep -i 'applications/google chrome canary.app$' | awk '{$1=""; print $0}' | head -n 1`);
- var chromeCanaryExecPath = `${chromeCanaryPath}/Contents/MacOS/Google Chrome Canary`;
- launchChrome(chromeCanaryExecPath, chromeArgs);
+ var chromeExecPath;
+ if (utils.isFile(process.env.CHROMIUM_PATH)) {
+ chromeExecPath = process.env.CHROMIUM_PATH;
+ } else {
+ var lsregister = "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Support/lsregister";
+ var chromeCanaryPath = shellOutput(`${lsregister} -dump | grep -i 'applications/google chrome canary.app$' | awk '{$1=""; print $0}' | head -n 1`);
+ chromeExecPath = `${chromeCanaryPath}/Contents/MacOS/Google Chrome Canary`;
+ }
+ launchChrome(chromeExecPath, chromeArgs);
}
function launchChromeLinux()
« no previous file with comments | « chrome/browser/devtools/devtools_ui_bindings.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698