diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-13 17:55:33 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-13 17:55:33 +0000 |
| commit | b9ad591d7eb92d8dfa81794b1c0160d77332f04a (patch) | |
| tree | dcaca286bb6a492458b3b8e4e0265ecbb8bb11cd /ash/wm | |
| parent | 2d5a9fae4dbe625fafe1c5bed10c56b1e7730f01 (diff) | |
| download | chromium_src-b9ad591d7eb92d8dfa81794b1c0160d77332f04a.zip chromium_src-b9ad591d7eb92d8dfa81794b1c0160d77332f04a.tar.gz chromium_src-b9ad591d7eb92d8dfa81794b1c0160d77332f04a.tar.bz2 | |
Fix CustomFrameViewAshTest.ResizeButtonToggleMaximize frame creation.
Always test CustomFrameViewAsh, which may not be the ash::Shell default.
( The new dialog style uses a BubbleFrameView for the default frame. )
( We might backtrack on that, but this change seems good either way. )
BUG=166075
TEST=CustomFrameViewAshTest.ResizeButtonToggleMaximize passes with the new dialog style (--enable-new-dialog-style)
R=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/15061005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199765 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm')
| -rw-r--r-- | ash/wm/custom_frame_view_ash_unittest.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ash/wm/custom_frame_view_ash_unittest.cc b/ash/wm/custom_frame_view_ash_unittest.cc index 5d12b11..c087046 100644 --- a/ash/wm/custom_frame_view_ash_unittest.cc +++ b/ash/wm/custom_frame_view_ash_unittest.cc @@ -68,7 +68,10 @@ class ShellViewsDelegate : public views::TestViewsDelegate { // Overridden from views::TestViewsDelegate: virtual views::NonClientFrameView* CreateDefaultNonClientFrameView( views::Widget* widget) OVERRIDE { - return ash::Shell::GetInstance()->CreateDefaultNonClientFrameView(widget); + // Always test CustomFrameViewAsh, which may not be the ash::Shell default. + CustomFrameViewAsh* frame_view = new CustomFrameViewAsh; + frame_view->Init(widget); + return frame_view; } virtual bool UseTransparentWindows() const OVERRIDE { // Ash uses transparent window frames. |