Fix positioning of children of NativeViewHostAura

ui/views/controls/native/native_view_host_aura.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 "ui/views/controls/native/native_view_host_aura.h"
 
 #include "base/logging.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/window.h"
@@ skipping 46 matching lines @@
   virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE {}
 
  private:
   aura::Window* native_view_;
 };
 
 NativeViewHostAura::NativeViewHostAura(NativeViewHost* host)
     : host_(host),
       clipping_window_delegate_(new ClippingWindowDelegate()),
       clipping_window_(clipping_window_delegate_.get()) {
+  // Set the type so descendant views (including popups) get positioned
+  // appropriately.
+  clipping_window_.SetType(ui::wm::WINDOW_TYPE_CONTROL);
   clipping_window_.Init(aura::WINDOW_LAYER_NOT_DRAWN);
   clipping_window_.set_owned_by_parent(false);
   clipping_window_.SetName("NativeViewHostAuraClip");
   clipping_window_.layer()->SetMasksToBounds(true);
   clipping_window_.SetProperty(views::kHostViewKey, static_cast<View*>(host_));
 }
 
 NativeViewHostAura::~NativeViewHostAura() {
   if (host_->native_view()) {
     host_->native_view()->RemoveObserver(this);
@@ skipping 149 matching lines @@
     } else {
       clipping_window_.RemoveChild(host_->native_view());
     }
     host_->native_view()->SetBounds(clipping_window_.bounds());
   }
   if (clipping_window_.parent())
     clipping_window_.parent()->RemoveChild(&clipping_window_);
 }
 
 }  // namespace views