mirror of
				https://bitbucket.org/chromiumembedded/cef
				synced 2025-06-05 21:39:12 +02:00 
			
		
		
		
	Fix path override ordering (fixes #3749)
The chrome::DIR_RESOURCES and ui::DIR_LOCALES overrides need to be configured before calling ChromeMainDelegate::PreSandboxStartup.
This commit is contained in:
		| @@ -376,12 +376,6 @@ void ChromeMainDelegateCef::PreSandboxStartup() { | |||||||
|   // number in the app bundle path. |   // number in the app bundle path. | ||||||
|   resource_util::OverrideUserDataDir(settings_, command_line); |   resource_util::OverrideUserDataDir(settings_, command_line); | ||||||
|  |  | ||||||
|   ChromeMainDelegate::PreSandboxStartup(); |  | ||||||
|  |  | ||||||
|   // Initialize crash reporting state for this process/module. |  | ||||||
|   // chrome::DIR_CRASH_DUMPS must be configured before calling this function. |  | ||||||
|   crash_reporting::PreSandboxStartup(*command_line, process_type); |  | ||||||
|  |  | ||||||
|   base::FilePath resources_dir; |   base::FilePath resources_dir; | ||||||
|   if (command_line->HasSwitch(switches::kResourcesDirPath)) { |   if (command_line->HasSwitch(switches::kResourcesDirPath)) { | ||||||
|     resources_dir = |     resources_dir = | ||||||
| @@ -402,6 +396,12 @@ void ChromeMainDelegateCef::PreSandboxStartup() { | |||||||
|     } |     } | ||||||
|   } |   } | ||||||
|  |  | ||||||
|  |   ChromeMainDelegate::PreSandboxStartup(); | ||||||
|  |  | ||||||
|  |   // Initialize crash reporting state for this process/module. | ||||||
|  |   // chrome::DIR_CRASH_DUMPS must be configured before calling this function. | ||||||
|  |   crash_reporting::PreSandboxStartup(*command_line, process_type); | ||||||
|  |  | ||||||
| #if !BUILDFLAG(IS_WIN) | #if !BUILDFLAG(IS_WIN) | ||||||
|   // Call after InitLogging() potentially changes values in |   // Call after InitLogging() potentially changes values in | ||||||
|   // chrome/app/chrome_main_delegate.cc. |   // chrome/app/chrome_main_delegate.cc. | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user