| Index: ui/message_center/views/message_popup_collection_unittest.cc
|
| diff --git a/ui/message_center/views/message_popup_collection_unittest.cc b/ui/message_center/views/message_popup_collection_unittest.cc
|
| index 551e4dd3357e125c4aecbff86d70bb2268a02cff..1d1391c79584f5f041eda864f33c7539bc7b2a24 100644
|
| --- a/ui/message_center/views/message_popup_collection_unittest.cc
|
| +++ b/ui/message_center/views/message_popup_collection_unittest.cc
|
| @@ -31,8 +31,16 @@ class MessagePopupCollectionTest : public views::ViewsTestBase {
|
| MessageCenter::Initialize();
|
| MessageCenter::Get()->DisableTimersForTest();
|
| alignment_delegate_.reset(new DesktopPopupAlignmentDelegate);
|
| +
|
| + gfx::NativeView parent = NULL;
|
| +#if defined(USE_ASH)
|
| + // On ChromeOS the parent is a special container window. In tests, provide
|
| + // the root window instead. Note on a Windows ash build the parent is later
|
| + // NULLed out, because the message center is managed in desktop mode only.
|
| + parent = GetContext();
|
| +#endif
|
| collection_.reset(new MessagePopupCollection(
|
| - GetContext(), MessageCenter::Get(), NULL, alignment_delegate_.get()));
|
| + parent, MessageCenter::Get(), NULL, alignment_delegate_.get()));
|
| // This size fits test machines resolution and also can keep a few toasts
|
| // w/o ill effects of hitting the screen overflow. This allows us to assume
|
| // and verify normal layout of the toast stack.
|
|
|