Create the omnibox dropdown and the status bubble windows using TYPE_MENU which ensures that they use the Software compositor on Windows.

This is a short term hack to workaround the UI thread blocking issue while creating the command buffer in the browser.
We will revert this change once 125248 is fixed. This change will cause the omnibox dropdown to lose the 2 pixel
transparency effect which should be ok in the nearterm.

BUG=125248

Review URL: https://codereview.chromium.org/1185503002

Cr-Commit-Position: refs/heads/master@{#335032}

1 files changed, 6 insertions, 0 deletions

diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
index 2ee6351..cbe70fa 100644
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
@@ -104,6 +104,12 @@ class DesktopNativeWidgetTopLevelHandler : public aura::WindowObserver {
     // This widget instance will get deleted when the window is
     // destroyed.
     top_level_handler->top_level_widget_ = new Widget();
+    // Ensure that we always use the DesktopNativeWidgetAura instance as the
+    // native widget here. If we enter this code path in tests then it is
+    // possible that we may end up with a NativeWidgetAura instance as the
+    // native widget which breaks this code path.
+    init_params.native_widget =
+        new DesktopNativeWidgetAura(top_level_handler->top_level_widget_);
     top_level_handler->top_level_widget_->Init(init_params);
 
     top_level_handler->top_level_widget_->SetFullscreen(full_screen);