Converts usage of GetBrowserViewForNativeWindow to

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/browser.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "views/widget/widget.h"
 
-namespace {
-
-BrowserBubbleHost* GetBubbleHostFromFrame(views::Widget* frame) {
-  if (!frame)
-    return NULL;
-
-  BrowserBubbleHost* bubble_host = NULL;
-  views::Widget* window = frame->GetTopLevelWidget();
-  if (window) {
-    bubble_host = BrowserView::GetBrowserViewForNativeWindow(
-        window->GetNativeWindow());
-    DCHECK(bubble_host);
-  }
-
-  return bubble_host;
-}
-
-}  // namespace
-
-BrowserBubble::BrowserBubble(views::View* view,
-                             views::Widget* frame,
+BrowserBubble::BrowserBubble(Browser* browser,
+                             views::View* view,
                              const gfx::Rect& relative_to,
                              views::BubbleBorder::ArrowLocation arrow_location)
-    : frame_(frame),
+    : frame_(NULL),
       view_(view),
       relative_to_(relative_to),
       arrow_location_(arrow_location),
       delegate_(NULL),
       attached_(false),
-      bubble_host_(GetBubbleHostFromFrame(frame)) {
+      bubble_host_(NULL) {
+  BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser);
+  frame_ = browser_view->GetWidget();
+  bubble_host_ = browser_view;
   // 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
   // in the bubble. See http://crbug.com/80416.
   int corner_inset = views::BubbleBorder::GetCornerRadius() / 2;
   gfx::Insets content_margins(corner_inset, corner_inset,
@@ skipping 86 matching lines @@
   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));
 }