aura: Add fullscreen/popups to RenderWidgetHostViewAura.

views/widget/native_widget_aura.cc

 // Copyright (c) 2011 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 "views/widget/native_widget_aura.h"
 
 #include "base/bind.h"
 #include "ui/aura/desktop.h"
 #include "ui/aura/event.h"
 #include "ui/aura/window.h"
@@ skipping 13 matching lines @@
 #endif
 
 #if defined(HAVE_IBUS)
 #include "views/ime/input_method_ibus.h"
 #else
 #include "views/ime/mock_input_method.h"
 #endif
 
 namespace views {
 
-const char* const NativeWidgetAura::kWindowTypeKey = "WindowType";
+namespace {
+
+aura::WindowType GetAuraWindowTypeForWidgetType(Widget::InitParams::Type type) {
+  switch (type) {
+    case Widget::InitParams::TYPE_WINDOW:
+      return aura::WINDOW_TYPE_NORMAL;
+    case Widget::InitParams::TYPE_WINDOW_FRAMELESS:
+    case Widget::InitParams::TYPE_CONTROL:
+    case Widget::InitParams::TYPE_POPUP:
+    case Widget::InitParams::TYPE_BUBBLE:
+      return aura::WINDOW_TYPE_POPUP;
+    case Widget::InitParams::TYPE_MENU:
+      return aura::WINDOW_TYPE_MENU;
+    case Widget::InitParams::TYPE_TOOLTIP:
+      return aura::WINDOW_TYPE_TOOLTIP;
+    default:
+      NOTREACHED() << "Unhandled widget type " << type;
+      return aura::WINDOW_TYPE_UNKNOWN;
+  }
+}
+
+}  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetAura, public:
 
 NativeWidgetAura::NativeWidgetAura(internal::NativeWidgetDelegate* delegate)
     : delegate_(delegate),
       ALLOW_THIS_IN_INITIALIZER_LIST(window_(new aura::Window(this))),
       ownership_(Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET),
       ALLOW_THIS_IN_INITIALIZER_LIST(close_widget_factory_(this)),
       can_activate_(true),
@@ skipping 21 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetAura, internal::NativeWidgetPrivate implementation:
 
 void NativeWidgetAura::InitNativeWidget(const Widget::InitParams& params) {
   ownership_ = params.ownership;
   window_->set_user_data(this);
   Widget::InitParams::Type window_type =
       params.child ? Widget::InitParams::TYPE_CONTROL : params.type;
-  SetNativeWindowProperty(kWindowTypeKey, reinterpret_cast<void*>(window_type));
-  window_->SetType(window_type == Widget::InitParams::TYPE_CONTROL ?
-                   aura::kWindowType_Control : aura::kWindowType_None);
+  window_->SetType(GetAuraWindowTypeForWidgetType(window_type));
   window_->Init(params.create_texture_for_layer ?
-                ui::Layer::LAYER_HAS_TEXTURE : ui::Layer::LAYER_HAS_NO_TEXTURE);
+                  ui::Layer::LAYER_HAS_TEXTURE :

[Ben Goodger (Google), 2011/10/31 17:59:48]

these lines should be indent 2 more spaces

[Daniel Erat, 2011/10/31 19:48:18]

I always go back and forth between 2 and 4 in the ternary-within-param-list
case.  Switched to 4.

+                  ui::Layer::LAYER_HAS_NO_TEXTURE,
+                window_type == Widget::InitParams::TYPE_CONTROL ?
+                  aura::Window::LAYER_INITIALLY_VISIBLE :

[Ben Goodger (Google), 2011/10/31 17:59:48]

It really pains to add an extra parameter to every Init() to cover this one
case. Maybe we could just SetVisible(true) after this line instead?

[Daniel Erat, 2011/10/31 19:48:18]

It pained me to update all the callers too. :-P  I've removed the parameter and
have made NativeWidgetAura::InitNativeWidget() call Window::Show() instead for
controls.

+                  aura::Window::LAYER_INITIALLY_INVISIBLE);
   // TODO(beng): respect |params| authoritah wrt transparency.
   window_->layer()->SetFillsBoundsOpaquely(false);
   delegate_->OnNativeWidgetCreated();
   window_->set_minimum_size(delegate_->GetMinimumSize());
   window_->SetBounds(params.bounds);
   if (params.type == Widget::InitParams::TYPE_CONTROL) {
     window_->SetParent(params.GetParent());
   } else {
     window_->SetParent(NULL);
     gfx::NativeView parent = params.GetParent();
@@ skipping 543 matching lines @@
 }
 
 // static
 bool NativeWidgetPrivate::IsMouseButtonDown() {
   NOTIMPLEMENTED();
   return false;
 }
 
 }  // namespace internal
 }  // namespace views