summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_browsertest.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-12 20:18:25 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-12 20:18:25 +0000
commit0834a4b75e40256a08e4a0b1bacab2e8b69da665 (patch)
tree7f283ebcf5b95a6c36de2e03667a80d0a00cb17a /chrome/browser/browser_browsertest.cc
parent21f1caa23bc5c8bc3fa611bcb229f23eb761aa9c (diff)
downloadchromium_src-0834a4b75e40256a08e4a0b1bacab2e8b69da665.zip
chromium_src-0834a4b75e40256a08e4a0b1bacab2e8b69da665.tar.gz
chromium_src-0834a4b75e40256a08e4a0b1bacab2e8b69da665.tar.bz2
Exit DOMUI menu when browser window is destroyed.
This correctly exits the loop, then destroy menu2 instance when the browser is closed while the menu is open. BUG=chromium-os:7642 TEST=CloseWithAppMenuOpen browser test should pass. Review URL: http://codereview.chromium.org/3643004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62328 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_browsertest.cc')
-rw-r--r--chrome/browser/browser_browsertest.cc9
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc
index e109d55..5dab3bf 100644
--- a/chrome/browser/browser_browsertest.cc
+++ b/chrome/browser/browser_browsertest.cc
@@ -562,16 +562,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) {
}
#endif // !defined(OS_CHROMEOS)
-#if defined(OS_CHROMEOS)
-// crosbug.com/7642.
-#define MAYBE_CloseWithAppMenuOpen DISABLED_CloseWithAppMenuOpen
-#else
-#define MAYBE_CloseWithAppMenuOpen CloseWithAppMenuOpen
-#endif
-
// This test verifies we don't crash when closing the last window and the app
// menu is showing.
-IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_CloseWithAppMenuOpen) {
+IN_PROC_BROWSER_TEST_F(BrowserTest, CloseWithAppMenuOpen) {
if (browser_defaults::kBrowserAliveWithNoWindows)
return;