Converts usage of GetBrowserViewForNativeWindow to

chrome/browser/ui/views/extensions/extension_popup.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/extensions/extension_popup.h"
 
 #include <vector>
 
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/wm_ipc.h"
 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h"
 #endif
 
 using std::vector;
 using views::Widget;
 
 // The minimum/maximum dimensions of the popup.
 // The minimum is just a little larger than the size of the button itself.
 // The maximum is an arbitrary number that should be smaller than most screens.
 const int ExtensionPopup::kMinWidth = 25;
 const int ExtensionPopup::kMinHeight = 25;
 const int ExtensionPopup::kMaxWidth = 800;
 const int ExtensionPopup::kMaxHeight = 600;
 
 ExtensionPopup::ExtensionPopup(
+    Browser* browser,
     ExtensionHost* host,
-    views::Widget* frame,
     const gfx::Rect& relative_to,
     views::BubbleBorder::ArrowLocation arrow_location,
     bool inspect_with_devtools,
     Observer* observer)
-    : BrowserBubble(host->view(),
-                    frame,
+    : BrowserBubble(browser,
+                    host->view(),
                     relative_to,
                     arrow_location),
       relative_to_(relative_to),
       extension_host_(host),
       inspect_with_devtools_(inspect_with_devtools),
       close_on_lost_focus_(true),
       closing_(false),
       observer_(observer) {
   AddRef();  // Balanced in Close();
   set_delegate(this);
@@ skipping 120 matching lines @@
     views::BubbleBorder::ArrowLocation arrow_location,
     bool inspect_with_devtools,
     Observer* observer) {
   ExtensionProcessManager* manager =
       browser->profile()->GetExtensionProcessManager();
   DCHECK(manager);
   if (!manager)
     return NULL;
 
   ExtensionHost* host = manager->CreatePopupHost(url, browser);
-  views::Widget* frame = BrowserView::GetBrowserViewForNativeWindow(
-      browser->window()->GetNativeHandle())->GetWidget();
-  ExtensionPopup* popup = new ExtensionPopup(host, frame, relative_to,
+  ExtensionPopup* popup = new ExtensionPopup(browser, host, relative_to,
                                              arrow_location,
                                              inspect_with_devtools, observer);
 
   // If the host had somehow finished loading, then we'd miss the notification
   // and not show.  This seems to happen in single-process mode.
   if (host->did_stop_loading())
     popup->Show(true);
 
   return popup;
 }
 
 void ExtensionPopup::Close() {
   if (closing_)
     return;
   closing_ = true;
   DetachFromBrowser();
 
   if (observer_)
     observer_->ExtensionPopupIsClosing(this);
 
   Release();  // Balanced in ctor.
 }