diff options
| author | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-31 06:23:22 +0000 |
|---|---|---|
| committer | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-31 06:23:22 +0000 |
| commit | f7f61087146eff6339cb5a5ab35ae6ad486b30aa (patch) | |
| tree | 546c72064cdea98de0f792ec5f01f9a1a043278b | |
| parent | a9a40461f5cb4c62f21d2a693effa8916fa723ad (diff) | |
| download | chromium_src-f7f61087146eff6339cb5a5ab35ae6ad486b30aa.zip chromium_src-f7f61087146eff6339cb5a5ab35ae6ad486b30aa.tar.gz chromium_src-f7f61087146eff6339cb5a5ab35ae6ad486b30aa.tar.bz2 | |
Removes MAYBE from BaseLayoutManager.MaximizeRootWindowResize
BUG=None
R=sky@chromium.org
TEST=win7_aura/win8_aura succeeds
Review URL: https://chromiumcodereview.appspot.com/20539002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214584 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ash/wm/base_layout_manager_unittest.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/ash/wm/base_layout_manager_unittest.cc b/ash/wm/base_layout_manager_unittest.cc index 80a85d7..c6f7156 100644 --- a/ash/wm/base_layout_manager_unittest.cc +++ b/ash/wm/base_layout_manager_unittest.cc @@ -126,15 +126,8 @@ TEST_F(BaseLayoutManagerTest, FocusDuringUnminimize) { EXPECT_EQ(ui::SHOW_STATE_DEFAULT, delegate.GetShowStateAndReset()); } -#if defined(OS_WIN) -// RootWindow and Display can't resize on Windows Ash. http://crbug.com/165962 -#define MAYBE_MaximizeRootWindowResize DISABLED_MaximizeRootWindowResize -#else -#define MAYBE_MaximizeRootWindowResize MaximizeRootWindowResize -#endif - // Tests maximized window size during root window resize. -TEST_F(BaseLayoutManagerTest, MAYBE_MaximizeRootWindowResize) { +TEST_F(BaseLayoutManagerTest, MaximizeRootWindowResize) { gfx::Rect bounds(100, 100, 200, 200); scoped_ptr<aura::Window> window(CreateTestWindow(bounds)); window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED); |