From da52017d82c56a44254e78058134ee6cae99f8db Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 11 Jan 2016 10:30:17 +0800 Subject: [PATCH 1/2] Revert "fix chrome app and user path conflicts" This reverts commit 25aaafde45bd3ac7d9a82184f67b79874da73aa8. --- chromium_src/chrome/common/chrome_paths.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium_src/chrome/common/chrome_paths.h b/chromium_src/chrome/common/chrome_paths.h index 3a76e3295f..581fdc06f7 100644 --- a/chromium_src/chrome/common/chrome_paths.h +++ b/chromium_src/chrome/common/chrome_paths.h @@ -17,7 +17,7 @@ class FilePath; namespace chrome { enum { - PATH_START = 2000, + PATH_START = 1000, DIR_APP = PATH_START, // Directory where dlls and data reside. DIR_LOGS, // Directory where logs should be written. From adcdf123af0d1923e2336f0ee38c172d1624d025 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 11 Jan 2016 10:40:45 +0800 Subject: [PATCH 2/2] Change brightray's PATH_START to 11000 --- vendor/brightray | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/brightray b/vendor/brightray index 8550f2a032..8b6c24dce2 160000 --- a/vendor/brightray +++ b/vendor/brightray @@ -1 +1 @@ -Subproject commit 8550f2a032b332d86bd8a7ec235685e22d028906 +Subproject commit 8b6c24dce25e743ceecd06d1c175c1cf8b91627b