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

BUG=353533
TEST=None
R=sky
TBR=benwells (For trivial change to apps/ui/views/native_app_window_views.cc)

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272287 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 3 insertions, 57 deletions

diff --git a/ui/views/accessibility/native_view_accessibility_win_unittest.cc b/ui/views/accessibility/native_view_accessibility_win_unittest.cc
index fed7b7f..3edab8e 100644
--- a/ui/views/accessibility/native_view_accessibility_win_unittest.cc
+++ b/ui/views/accessibility/native_view_accessibility_win_unittest.cc
@@ -128,7 +128,6 @@ TEST_F(NativeViewAcccessibilityWinTest, AuraOwnedWidgets) {
   Widget::InitParams owned_init_params =
       CreateParams(Widget::InitParams::TYPE_POPUP);
   owned_init_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-  owned_init_params.child = false;
   owned_init_params.parent = widget.GetNativeView();
   owned_widget.Init(owned_init_params);
   owned_widget.Show();
diff --git a/ui/views/examples/examples_window.cc b/ui/views/examples/examples_window.cc
index f22ebf9..8372669 100644
--- a/ui/views/examples/examples_window.cc
+++ b/ui/views/examples/examples_window.cc
@@ -220,7 +220,6 @@ void ShowExamplesWindow(Operation operation,
     params.delegate = new ExamplesWindowContents(operation, examples.Pass());
     params.context = window_context;
     params.bounds = gfx::Rect(0, 0, 850, 300);
-    params.top_level = true;
     params.remove_standard_frame = true;
     widget->Init(params);
     widget->Show();
diff --git a/ui/views/widget/native_widget_unittest.cc b/ui/views/widget/native_widget_unittest.cc
index 133f8be0..9002e9d 100644
--- a/ui/views/widget/native_widget_unittest.cc
+++ b/ui/views/widget/native_widget_unittest.cc
@@ -42,7 +42,6 @@ class NativeWidgetTest : public ViewsTestBase {
     Widget* widget = new Widget;
     Widget::InitParams params = CreateParams(type);
     params.ownership = views::Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET;
-    params.child = false; // Implicitly set to true by ctor with TYPE_CONTROL.
     params.bounds = gfx::Rect(10, 10, 200, 200);
     widget->Init(params);
     return widget->native_widget_private();
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
index a03bae6..b2ce42f 100644
--- a/ui/views/widget/widget.cc
+++ b/ui/views/widget/widget.cc
@@ -118,7 +118,6 @@ Widget::InitParams::InitParams()
       parent(NULL),
       native_widget(NULL),
       desktop_window_tree_host(NULL),
-      top_level(false),
       layer_type(aura::WINDOW_LAYER_TEXTURED),
       context(NULL),
       force_show_in_taskbar(false) {
@@ -127,7 +126,7 @@ Widget::InitParams::InitParams()
 Widget::InitParams::InitParams(Type type)
     : type(type),
       delegate(NULL),
-      child(type == TYPE_CONTROL),
+      child(false),
       opacity(INFER_OPACITY),
       accept_events(true),
       activatable(ACTIVATABLE_DEFAULT),
@@ -143,7 +142,6 @@ Widget::InitParams::InitParams(Type type)
       parent(NULL),
       native_widget(NULL),
       desktop_window_tree_host(NULL),
-      top_level(false),
       layer_type(aura::WINDOW_LAYER_TEXTURED),
       context(NULL),
       force_show_in_taskbar(false) {
@@ -202,7 +200,6 @@ Widget* Widget::CreateWindowWithBounds(WidgetDelegate* delegate,
   Widget::InitParams params;
   params.bounds = bounds;
   params.delegate = delegate;
-  params.top_level = true;
   widget->Init(params);
   return widget;
 }
@@ -332,11 +329,8 @@ void Widget::Init(const InitParams& in_params) {
   TRACE_EVENT0("views", "Widget::Init");
   InitParams params = in_params;
 
-  is_top_level_ = params.top_level ||
-      (!params.child &&
-       params.type != InitParams::TYPE_CONTROL &&
-       params.type != InitParams::TYPE_TOOLTIP);
-  params.top_level = is_top_level_;
+  params.child |= (params.type == InitParams::TYPE_CONTROL);
+  is_top_level_ = (!params.child && params.type != InitParams::TYPE_TOOLTIP);
 
   if (params.opacity == views::Widget::InitParams::INFER_OPACITY &&
       params.type != views::Widget::InitParams::TYPE_WINDOW &&
diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
index 6bdf589..17e1247 100644
--- a/ui/views/widget/widget.h
+++ b/ui/views/widget/widget.h
@@ -235,10 +235,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
     // TODO(beng): Figure out if there's a better way to expose this, e.g. get
     // rid of NW subclasses and do this all via message handling.
     DesktopWindowTreeHost* desktop_window_tree_host;
-    // Whether this window is intended to be a toplevel window with no
-    // attachment to any other window. (This may be a transient window if
-    // |parent| is set.)
-    bool top_level;
     // Only used by NativeWidgetAura. Specifies the type of layer for the
     // aura::Window. Default is WINDOW_LAYER_TEXTURED.
     aura::WindowLayerType layer_type;
diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc
index eb25225..3591781 100644
--- a/ui/views/widget/widget_unittest.cc
+++ b/ui/views/widget/widget_unittest.cc
@@ -1683,46 +1683,6 @@ TEST_F(WidgetWindowTitleTest, SetWindowTitleChanged_DesktopNativeWidget) {
 }
 #endif  // !OS_CHROMEOS
 
-// Used by SetTopLevelCorrectly to track calls to OnBeforeWidgetInit().
-class VerifyTopLevelDelegate : public TestViewsDelegate {
- public:
-  VerifyTopLevelDelegate()
-      : on_before_init_called_(false),
-        is_top_level_(false) {
-  }
-
-  bool on_before_init_called() const { return on_before_init_called_; }
-  bool is_top_level() const { return is_top_level_; }
-
-  virtual void OnBeforeWidgetInit(
-      Widget::InitParams* params,
-      internal::NativeWidgetDelegate* delegate) OVERRIDE {
-    on_before_init_called_ = true;
-    is_top_level_ = params->top_level;
-  }
-
- private:
-  bool on_before_init_called_;
-  bool is_top_level_;
-
-  DISALLOW_COPY_AND_ASSIGN(VerifyTopLevelDelegate);
-};
-
-// Verifies |top_level| is correctly passed to
-// ViewsDelegate::OnBeforeWidgetInit().
-TEST_F(WidgetTest, SetTopLevelCorrectly) {
-  set_views_delegate(NULL);
-  VerifyTopLevelDelegate* delegate = new VerifyTopLevelDelegate;
-  set_views_delegate(delegate);  // ViewsTestBase takes ownership.
-  scoped_ptr<Widget> widget(new Widget);
-  Widget::InitParams params =
-      CreateParams(views::Widget::InitParams::TYPE_POPUP);
-  params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-  widget->Init(params);
-  EXPECT_TRUE(delegate->on_before_init_called());
-  EXPECT_TRUE(delegate->is_top_level());
-}
-
 TEST_F(WidgetTest, WidgetDeleted_InOnMousePressed) {
   Widget* widget = new Widget;
   Widget::InitParams params =
diff --git a/ui/views/window/dialog_delegate.cc b/ui/views/window/dialog_delegate.cc
index 775b824..aabfa6d 100644
--- a/ui/views/window/dialog_delegate.cc
+++ b/ui/views/window/dialog_delegate.cc
@@ -35,7 +35,6 @@ Widget* DialogDelegate::CreateDialogWidget(DialogDelegate* dialog,
   }
   params.context = context;
   params.parent = parent;
-  params.top_level = true;
   // TODO(msw): Add a matching shadow type and remove the bubble frame border?
   params.shadow_type = views::Widget::InitParams::SHADOW_TYPE_NONE;
   widget->Init(params);