Reland Propagate OnNativeWidgetMove to delegate/observers, etc.

ui/views/bubble/bubble_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 "ui/views/bubble/bubble_delegate.h"
 
 #include "ui/base/animation/slide_animation.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/widget/widget.h"
@@ skipping 153 matching lines @@
 
 View* BubbleDelegateView::GetContentsView() {
   return this;
 }
 
 NonClientFrameView* BubbleDelegateView::CreateNonClientFrameView(
     Widget* widget) {
   return new BubbleFrameView(arrow_location(), color(), margin());
 }
 
+void BubbleDelegateView::OnWidgetClosing(Widget* widget) {
+  if (anchor_view() && anchor_view()->GetWidget() == widget)
+    anchor_view_ = NULL;
+}
+
 void BubbleDelegateView::OnWidgetVisibilityChanged(Widget* widget,
                                                    bool visible) {
-  if (widget == GetWidget()) {
-    if (visible) {
-      if (border_widget_)
-        border_widget_->Show();
-      GetFocusManager()->SetFocusedView(GetInitiallyFocusedView());
-      Widget* anchor_widget = anchor_view() ? anchor_view()->GetWidget() : NULL;
-      if (anchor_widget && anchor_widget->GetTopLevelWidget())
-        anchor_widget->GetTopLevelWidget()->DisableInactiveRendering();
-    } else if (border_widget_) {
+  if (widget != GetWidget())
+    return;
+
+  Widget* anchor_widget = anchor_view() ? anchor_view()->GetWidget() : NULL;
+  if (visible) {
+    if (border_widget_)
+      border_widget_->Show();
+    if (anchor_widget)
+      anchor_widget->AddObserver(this);
+    GetFocusManager()->SetFocusedView(GetInitiallyFocusedView());
+    if (anchor_widget && anchor_widget->GetTopLevelWidget())
+      anchor_widget->GetTopLevelWidget()->DisableInactiveRendering();
+  } else {
+    if (border_widget_)
       border_widget_->Hide();
-    }
+    if (anchor_widget)
+      anchor_widget->RemoveObserver(this);
   }
 }
 
 void BubbleDelegateView::OnWidgetActivationChanged(Widget* widget,
                                                    bool active) {
   if (close_on_deactivate() && widget == GetWidget() && !active)
     GetWidget()->Close();
 }
 
+void BubbleDelegateView::OnWidgetMoved(Widget* widget) {
+  if (anchor_view() && anchor_view()->GetWidget() == widget)
+    SizeToContents();
+}
+
 gfx::Rect BubbleDelegateView::GetAnchorRect() {
   return anchor_view() ? anchor_view()->GetScreenBounds() : gfx::Rect();
 }
 
 void BubbleDelegateView::Show() {
   GetWidget()->Show();
 }
 
 void BubbleDelegateView::StartFade(bool fade_in) {
   fade_animation_.reset(new ui::SlideAnimation(this));
@@ skipping 97 matching lines @@
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 gfx::Rect BubbleDelegateView::GetBubbleClientBounds() const {
   gfx::Rect client_bounds(GetBubbleFrameView()->GetBoundsForClientView());
   client_bounds.Offset(border_widget_->GetWindowScreenBounds().origin());
   return client_bounds;
 }
 #endif
 
 }  // namespace views