| 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()
|
|
|