| Index: chrome/browser/ui/views/chrome_views_delegate.cc
|
| diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc
|
| index 470b548cbae0b6c2a37696002827a6ad579ff9d6..2055136d836a52a5e5eb585bdb92663147e3a583 100644
|
| --- a/chrome/browser/ui/views/chrome_views_delegate.cc
|
| +++ b/chrome/browser/ui/views/chrome_views_delegate.cc
|
| @@ -413,6 +413,11 @@ void ChromeViewsDelegate::OnBeforeWidgetInit(
|
| #endif // USE_AURA
|
|
|
| #if defined(OS_CHROMEOS) || defined(USE_ASH)
|
| + // Mash lets the window server decide the default parent and default display
|
| + // for new widgets.
|
| + if (chrome::IsRunningInMash())
|
| + return;
|
| +
|
| // When we are doing straight chromeos builds, we still need to handle the
|
| // toplevel window case.
|
| // There may be a few remaining widgets in Chrome OS that are not top level,
|
|
|