summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui/ui_test.cc
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-20 20:35:52 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-20 20:35:52 +0000
commita3c070022d5dc890ab0cae5b802dfb4832ee612e (patch)
tree58fcd3fcd82c571bbafd8df3a8de7aa806218e55 /chrome/test/ui/ui_test.cc
parentd5e3134ae95c77ba72383c4299d47140b5c57468 (diff)
downloadchromium_src-a3c070022d5dc890ab0cae5b802dfb4832ee612e.zip
chromium_src-a3c070022d5dc890ab0cae5b802dfb4832ee612e.tar.gz
chromium_src-a3c070022d5dc890ab0cae5b802dfb4832ee612e.tar.bz2
Enable IDC_CLOSE_WINDOW on linux.
I filed http://crbug.com/12334 to fix the ifdefed-out block in ui_test.cc. Review URL: http://codereview.chromium.org/113655 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16526 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui/ui_test.cc')
-rw-r--r--chrome/test/ui/ui_test.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 62ba163..3c1f776 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -405,12 +405,16 @@ void UITest::QuitBrowser() {
browsers.push_back(browser_proxy);
}
+// This is disabled for now on linux because it causes a crash. See
+// http://crbug.com/12334
+#if !defined(OS_LINUX)
for (BrowserVector::iterator iter = browsers.begin();
iter != browsers.end(); ++iter) {
// Use ApplyAccelerator since it doesn't wait
(*iter)->ApplyAccelerator(IDC_CLOSE_WINDOW);
delete (*iter);
}
+#endif
// Now, drop the automation IPC channel so that the automation provider in
// the browser notices and drops its reference to the browser process.