Removes unnecessary views::Widget::InitParams::top_level

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 250 matching lines @@
     return;
 
 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
   bool use_non_toplevel_window =
       params->parent && params->type != views::Widget::InitParams::TYPE_MENU;
 
 #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.top_level) 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.
+  // 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->top_level ||
+      (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)
@@ skipping 17 matching lines @@
 
 #if defined(OS_CHROMEOS)
   // 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,
   // but have neither a context nor a parent. Provide a fallback context so
   // users don't crash. Developers will hit the DCHECK and should provide a
   // context.
   if (params->context)
     params->context = params->context->GetRootWindow();
-  DCHECK(params->parent || params->context || params->top_level)
+  DCHECK(params->parent || params->context || !params->child)
       << "Please provide a parent or context for this widget.";
   if (!params->parent && !params->context)
     params->context = ash::Shell::GetPrimaryRootWindow();
 #elif defined(USE_AURA)
   // While the majority of the time, context wasn't plumbed through due to the
-  // existence of a global WindowTreeClient, if this window is a toplevel, it's
+  // existence of a global WindowTreeClient, if this window is toplevel, it's
   // possible that there is no contextual state that we can use.
-  if (params->parent == NULL && params->context == NULL && params->top_level) {
+  if (params->parent == NULL &&
+      params->context == NULL &&
+      !params->child &&
+      params->type != views::Widget::InitParams::TYPE_TOOLTIP) {
     // We need to make a decision about where to place this window based on the
     // desktop type.
     switch (chrome::GetActiveDesktop()) {
       case chrome::HOST_DESKTOP_TYPE_NATIVE:
         // If we're native, we should give this window its own toplevel desktop
         // widget.
         params->native_widget = new views::DesktopNativeWidgetAura(delegate);
         break;
 #if defined(USE_ASH)
       case chrome::HOST_DESKTOP_TYPE_ASH:
@@ skipping 82 matching lines @@
 }
 #endif
 
 #if !defined(USE_AURA) && !defined(USE_CHROMEOS)
 views::Widget::InitParams::WindowOpacity
 ChromeViewsDelegate::GetOpacityForInitParams(
     const views::Widget::InitParams& params) {
   return views::Widget::InitParams::OPAQUE_WINDOW;
 }
 #endif