Re-land:

chrome/browser/ui/views/browser_bubble.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 "chrome/browser/ui/views/browser_bubble.h"
 
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #if defined(OS_WIN)
 #include "chrome/browser/external_tab_container_win.h"
 #endif
 #include "views/widget/root_view.h"
 #include "views/window/window.h"
 
 namespace {
 
 BrowserBubbleHost* GetBubbleHostFromFrame(views::Widget* frame) {
   if (!frame)
     return NULL;
 
   BrowserBubbleHost* bubble_host = NULL;
-  views::Window* window = frame->GetWindow();
+  views::Window* window = frame->GetContainingWindow();
   if (window) {
     bubble_host = BrowserView::GetBrowserViewForNativeWindow(
         window->GetNativeWindow());
     DCHECK(bubble_host);
   }
 
   return bubble_host;
 }
 
 }  // namespace
 
 BrowserBubble::BrowserBubble(views::View* view,
                              views::Widget* frame,
                              const gfx::Rect& relative_to,
                              BubbleBorder::ArrowLocation arrow_location)
     : frame_(frame),
       view_(view),
       relative_to_(relative_to),
       arrow_location_(arrow_location),
-      visible_(false),
       delegate_(NULL),
       attached_(false),
       bubble_host_(GetBubbleHostFromFrame(frame)) {
   // Keep relative_to_ in frame-relative coordinates to aid in drag
   // positioning.
   gfx::Point origin = relative_to_.origin();
   views::View::ConvertPointToView(NULL, frame_->GetRootView(), &origin);
   relative_to_.set_origin(origin);
 
   // Use half the corner radius as contents margins so that contents fit better
@@ skipping 35 matching lines @@
     bubble_host_->AttachBrowserBubble(this);
 
   attached_ = true;
 }
 
 void BrowserBubble::BrowserWindowMoved() {
   if (delegate_)
     delegate_->BubbleBrowserWindowMoved(this);
   else
     Hide();
-  if (visible_)
+  if (popup_->IsVisible())
     Reposition();
 }
 
 void BrowserBubble::BrowserWindowClosing() {
   if (delegate_)
     delegate_->BubbleBrowserWindowClosing(this);
   else
     Hide();
 }
 
@@ skipping 29 matching lines @@
 }
 
 void BrowserBubble::SetAbsoluteBounds(const gfx::Rect& window_bounds) {
   // Convert screen coordinates to frame relative.
   gfx::Point relative_origin = window_bounds.origin();
   views::View::ConvertPointToView(NULL, frame_->GetRootView(),
                                   &relative_origin);
   SetBounds(relative_origin.x(), relative_origin.y(),
             window_bounds.width(), window_bounds.height());
 }
+
+void BrowserBubble::MovePopup(int x, int y, int w, int h) {
+  popup_->SetBounds(gfx::Rect(x, y, w, h));
+}
+
+