diff options
author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-16 18:04:02 +0000 |
---|---|---|
committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-16 18:04:02 +0000 |
commit | 6a3b2aa7e37512c4bbc09b0aab2b34a159e1ec9c (patch) | |
tree | ae8b9083d2c2dd7518999afa80123c4d5f1eddd9 /chrome/browser/extensions/extension_tabs_apitest.cc | |
parent | f488ab8329fb5c0520bd569b7fa1f8f3b1a1e7fe (diff) | |
download | chromium_src-6a3b2aa7e37512c4bbc09b0aab2b34a159e1ec9c.zip chromium_src-6a3b2aa7e37512c4bbc09b0aab2b34a159e1ec9c.tar.gz chromium_src-6a3b2aa7e37512c4bbc09b0aab2b34a159e1ec9c.tar.bz2 |
Disable just UpdateWindowShowState
Accidentally picked up a few other tests the first time.
BUG=176683
TBR=jennb@chromium.org
R=jennb@chromium.org
Review URL: https://codereview.chromium.org/12284019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182978 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_tabs_apitest.cc')
-rw-r--r-- | chrome/browser/extensions/extension_tabs_apitest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc index 89418e2..2b748de 100644 --- a/chrome/browser/extensions/extension_tabs_apitest.cc +++ b/chrome/browser/extensions/extension_tabs_apitest.cc @@ -23,8 +23,7 @@ // Window resizes are not completed by the time the callback happens, // so these tests fail on linux/gtk. http://crbug.com/72369 -// Failing on Win7 http://crbug.com/176683 -#if (defined(OS_LINUX) && !defined(USE_AURA)) || defined(OS_WIN) +#if defined(OS_LINUX) && !defined(USE_AURA) #define MAYBE_FocusWindowDoesNotExitFullscreen \ DISABLED_FocusWindowDoesNotExitFullscreen #define MAYBE_UpdateWindowSizeExitsFullscreen \ @@ -33,14 +32,15 @@ #define MAYBE_UpdateWindowShowState DISABLED_UpdateWindowShowState #else -#if defined(USE_AURA) || defined(OS_MACOSX) +#if defined(USE_AURA) || defined(OS_MACOSX) || defined(OS_WIN) // Maximizing/fullscreen popup window doesn't work on aura's managed mode. // See bug crbug.com/116305. // Mac: http://crbug.com/103912 +// Failing on Win7: http://crbug.com/176683 #define MAYBE_UpdateWindowShowState DISABLED_UpdateWindowShowState #else #define MAYBE_UpdateWindowShowState UpdateWindowShowState -#endif // defined(USE_AURA) || defined(OS_MACOSX) +#endif // defined(USE_AURA) || defined(OS_MACOSX) || defined(OS_WIN) // TODO(linux_aura) http://crbug.com/163931 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA) |