summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/chrome_exe_main_win.cc5
-rw-r--r--chrome/chrome_exe.gypi3
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/app/chrome_exe_main_win.cc b/chrome/app/chrome_exe_main_win.cc
index 68a2519..2dc2c94 100644
--- a/chrome/app/chrome_exe_main_win.cc
+++ b/chrome/app/chrome_exe_main_win.cc
@@ -128,9 +128,8 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prev, wchar_t*, int) {
if (AttemptFastNotify(*CommandLine::ForCurrentProcess()))
return 0;
- // The purpose of this call is to force the addition of an entry in the IAT
- // for chrome_elf.dll to force a load time dependency.
- InitChromeElf();
+ // Signal Chrome Elf that Chrome has begun to start.
+ SignalChromeElf();
MetroDriver metro_driver;
if (metro_driver.in_metro_mode())
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index abd63a3..c8f9cef 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -465,6 +465,8 @@
}],
['OS=="win"', {
'dependencies': [
+ # Note that chrome_elf must be listed first. Do not reorder it.
+ '../chrome_elf/chrome_elf.gyp:chrome_elf',
'chrome_dll',
'chrome_nacl_win64',
'chrome_process_finder',
@@ -474,7 +476,6 @@
'../base/base.gyp:base',
'../breakpad/breakpad.gyp:breakpad_handler',
'../breakpad/breakpad.gyp:breakpad_sender',
- '../chrome_elf/chrome_elf.gyp:chrome_elf',
'../components/components.gyp:breakpad_component',
'../components/components.gyp:policy',
'../sandbox/sandbox.gyp:sandbox',