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/layout_manager.h"
 #include "ui/aura/window.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/view_constants_aura.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
+namespace {
+
+// This layout manager positions popups relative to the screen
+// coordinate system.
+class PopupAwareLayoutManager : public aura::LayoutManager {
+ public:
+  PopupAwareLayoutManager() {}
+  virtual ~PopupAwareLayoutManager() {}
+
+  virtual void OnWindowResized() OVERRIDE {}
+  virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE {}
+  virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE {}
+  virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE {}
+  virtual void OnChildWindowVisibilityChanged(aura::Window* child,
+                                              bool visible) OVERRIDE {}
+  virtual void SetChildBounds(aura::Window* child,
+                              const gfx::Rect& requested_bounds) OVERRIDE {
+    gfx::Rect bounds = requested_bounds;
+    if (child->type() == ui::wm::WINDOW_TYPE_POPUP)

[sky, 2014/07/22 13:12:27]

Ok, I get it now. But you need a comment as to why this is necessary.

[Evan Stade, 2014/07/22 21:45:30]

But this isn't necessary any more (you've commented on an older patchset). Did
you want a comment on the clipping_window_.SetType(ui::wm::WINDOW_TYPE_CONTROL);
line?

[sky, 2014/07/22 21:52:33]

SOrry. Yes. I want a comment there.

+      bounds.Offset(-child->parent()->GetBoundsInScreen().OffsetFromOrigin());
+    SetChildBoundsDirect(child, bounds);
+  }
+};
+
+}  // namespace
+
 NativeViewHostAura::NativeViewHostAura(NativeViewHost* host)
     : host_(host),
       clipping_window_(NULL) {
   clipping_window_.Init(aura::WINDOW_LAYER_NOT_DRAWN);
+  clipping_window_.SetLayoutManager(new PopupAwareLayoutManager());
   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);
     host_->native_view()->ClearProperty(views::kHostViewKey);
@@ skipping 141 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