chore: remove chrome_process_finder.patch (#16113)

electron · Dec 18, 2018 · 1c7a472 · 1c7a472
1 parent 7fc8afa
commit 1c7a472
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 60 deletions.
diff --git a/chromium_src/chrome/browser/process_singleton_win.cc b/chromium_src/chrome/browser/process_singleton_win.cc
@@ -77,19 +77,6 @@ BOOL CALLBACK BrowserWindowEnumeration(HWND window, LPARAM param) {
   return !*result;
 }
 
-// Convert Command line string to argv.
-base::CommandLine::StringVector CommandLineStringToArgv(
-    const std::wstring& command_line_string) {
-  int num_args = 0;
-  wchar_t** args = NULL;
-  args = ::CommandLineToArgvW(command_line_string.c_str(), &num_args);
-  base::CommandLine::StringVector argv;
-  for (int i = 0; i < num_args; ++i)
-    argv.push_back(std::wstring(args[i]));
-  LocalFree(args);
-  return argv;
-}
-
 bool ParseCommandLine(const COPYDATASTRUCT* cds,
                       base::CommandLine::StringVector* parsed_command_line,
                       base::FilePath* current_directory) {
@@ -143,7 +130,7 @@ bool ParseCommandLine(const COPYDATASTRUCT* cds,
     // Get command line.
     const std::wstring cmd_line =
         msg.substr(second_null + 1, third_null - second_null);
-    *parsed_command_line = CommandLineStringToArgv(cmd_line);
+    *parsed_command_line = base::CommandLine::FromString(cmd_line).argv();
     return true;
   }
   return false;

diff --git a/docs/api/app.md b/docs/api/app.md
@@ -398,6 +398,9 @@ non-minimized.
 This event is guaranteed to be emitted after the `ready` event of `app`
 gets emitted.
 
+**Note:** Extra command line arguments might be added by Chromium,
+such as `--original-process-start-time`.
+
 ### Event: 'remote-require'
 
 Returns:

diff --git a/patches/common/chromium/.patches b/patches/common/chromium/.patches
@@ -67,7 +67,6 @@ tts.patch
 color_chooser.patch
 printing.patch
 verbose_generate_breakpad_symbols.patch
-chrome_process_finder.patch
 customizable_app_indicator_id_prefix.patch
 cross_site_document_resource_handler.patch
 content_allow_embedder_to_prevent_locking_scheme_registry.patch

diff --git a/patches/common/chromium/chrome_process_finder.patch b/patches/common/chromium/chrome_process_finder.patch