diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-23 21:52:18 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-23 21:52:18 +0000 |
| commit | 98663c2a8ace43b28888cb61ac5f8ae7ceed3f00 (patch) | |
| tree | f904fae7900455d4b3b38c21d3faf27874946823 /win8 | |
| parent | a6a7434cda3fefc4a6852566640c2478e914d071 (diff) | |
| download | chromium_src-98663c2a8ace43b28888cb61ac5f8ae7ceed3f00.zip chromium_src-98663c2a8ace43b28888cb61ac5f8ae7ceed3f00.tar.gz chromium_src-98663c2a8ace43b28888cb61ac5f8ae7ceed3f00.tar.bz2 | |
Remove AtExit manager instance from metro_driver for component builds.
This prevents the Metro Chrome viewer process from crashing at exit when using the component build which is annoying for tests that start and stop the viewer process frequently.
BUG=154081
TEST=Metro Chrome does not crash on exit when using the component build.
Review URL: https://chromiumcodereview.appspot.com/12040040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178388 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8')
| -rw-r--r-- | win8/metro_driver/metro_driver.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/win8/metro_driver/metro_driver.cc b/win8/metro_driver/metro_driver.cc index b08b300..f740c0a 100644 --- a/win8/metro_driver/metro_driver.cc +++ b/win8/metro_driver/metro_driver.cc @@ -50,11 +50,14 @@ const GUID kChromeTraceProviderName = { { 0x80, 0xc1, 0x52, 0x7f, 0xea, 0x23, 0xe3, 0xa7 } }; } + +#if !defined(COMPONENT_BUILD) // Required for base initialization. // TODO(siggi): This should be handled better, as this way our at exit // registrations will run under the loader's lock. However, // once metro_driver is merged into Chrome.dll, this will go away anyhow. base::AtExitManager at_exit; +#endif namespace Hacks { |