Use the force_software_compositing flag in the Widget::InitParams structure instead of the TYPE_MEN…

chrome/browser/ui/views/chrome_views_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/chrome_views_delegate.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string_util.h"
@@ skipping 315 matching lines @@
     params->opacity = GetOpacityForInitParams(*params);
 
   // If we already have a native_widget, we don't have to try to come
   // up with one.
   if (params->native_widget)
     return;
 
 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
   bool use_non_toplevel_window =
       params->parent &&
-      params->type != views::Widget::InitParams::TYPE_MENU &&
+      !params->force_software_compositing &&
       params->type != views::Widget::InitParams::TYPE_TOOLTIP;
 
 #if defined(OS_WIN)
   // On desktop Linux Chrome must run in an environment that supports a variety
   // of window managers, some of which do not play nicely with parts of our UI
   // that have specific expectations about window sizing and placement. For this
   // reason windows opened as top level (!params.child) are always constrained
   // by the browser frame, so we can position them correctly. This has some
   // negative side effects, like dialogs being clipped by the browser frame, but
   // the side effects are not as bad as the poor window manager interactions. On
   // Windows however these WM interactions are not an issue, so we open windows
   // requested as top_level as actual top level windows on the desktop.
   use_non_toplevel_window = use_non_toplevel_window &&
       (params->child ||
        chrome::GetHostDesktopTypeForNativeView(params->parent) !=
           chrome::HOST_DESKTOP_TYPE_NATIVE);
 
   if (!ui::win::IsAeroGlassEnabled()) {
     // If we don't have composition (either because Glass is not enabled or
     // because it was disabled at the command line), anything that requires
     // transparency will be broken with a toplevel window, so force the use of
     // a non toplevel window.
     if (params->opacity == views::Widget::InitParams::TRANSLUCENT_WINDOW &&
-        params->type != views::Widget::InitParams::TYPE_MENU)
+        !params->force_software_compositing)
       use_non_toplevel_window = true;
   } else {
     // If we're on Vista+ with composition enabled, then we can use toplevel
     // windows for most things (they get blended via WS_EX_COMPOSITED, which
     // allows for animation effects, but also exceeding the bounds of the parent
     // window).
     if (chrome::GetActiveDesktop() != chrome::HOST_DESKTOP_TYPE_ASH &&
         params->parent &&
         params->type != views::Widget::InitParams::TYPE_CONTROL &&
         params->type != views::Widget::InitParams::TYPE_WINDOW) {
@@ skipping 134 matching lines @@
   return content::BrowserThread::GetBlockingPool();
 }
 
 #if !defined(USE_ASH)
 views::Widget::InitParams::WindowOpacity
 ChromeViewsDelegate::GetOpacityForInitParams(
     const views::Widget::InitParams& params) {
   return views::Widget::InitParams::OPAQUE_WINDOW;
 }
 #endif