| Index: ash/wm/custom_frame_view_ash_unittest.cc
|
| diff --git a/ash/wm/custom_frame_view_ash_unittest.cc b/ash/wm/custom_frame_view_ash_unittest.cc
|
| index 5d12b114fce3df94d88544a44f8b43a3ec2dc06c..c08704679b8d1a8aa51ab83c01c4fbd2858b3ea2 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.
|
|
|