diff options
| author | justinlin@chromium.org <justinlin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-05 17:52:03 +0000 |
|---|---|---|
| committer | justinlin@chromium.org <justinlin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-05 17:52:03 +0000 |
| commit | 7aaeb4f01663186f2178aa77380db3d281050df0 (patch) | |
| tree | 626113fb552bffa1dd292ccfee8f4a8e144f0957 /ash | |
| parent | 05552e20a1e865bb464a4108d3e733e27793194c (diff) | |
| download | chromium_src-7aaeb4f01663186f2178aa77380db3d281050df0.zip chromium_src-7aaeb4f01663186f2178aa77380db3d281050df0.tar.gz chromium_src-7aaeb4f01663186f2178aa77380db3d281050df0.tar.bz2 | |
Fix build broken by r227200 when disabling test.
TBR=justinlin
Review URL: https://codereview.chromium.org/26137002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227201 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/wm/panels/panel_window_resizer_unittest.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ash/wm/panels/panel_window_resizer_unittest.cc b/ash/wm/panels/panel_window_resizer_unittest.cc index 3825b44..191a6c4 100644 --- a/ash/wm/panels/panel_window_resizer_unittest.cc +++ b/ash/wm/panels/panel_window_resizer_unittest.cc @@ -467,9 +467,11 @@ TEST_F(PanelWindowResizerTest, DragReordersPanelsVertical) { // The transient children should be reparented in sync with the panel. TEST_P(PanelWindowResizerTransientTest, PanelWithTransientChild) { +#if defined(OS_WIN) // http://crbug.com/304544 if (win::GetVersion() >= win::VERSION_WIN8) return true; +#endif scoped_ptr<aura::Window> window(CreatePanelWindow(gfx::Point(0, 0))); scoped_ptr<aura::Window> child(CreateTestWindowInShellWithDelegateAndType( |