Converts usage of GetBrowserViewForNativeWindow to

chrome/browser/ui/views/frame/browser_view.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/frame/browser_view.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 365 matching lines @@
     delete tabstrip_;
     tabstrip_ = NULL;
   }
   // Child views maintain PrefMember attributes that point to
   // OffTheRecordProfile's PrefService which gets deleted by ~Browser.
   RemoveAllChildViews(true);
   // Explicitly set browser_ to NULL.
   browser_.reset();
 }
 
+// Tab dragging code on windows needs this.
+#if defined(OS_WIN) && !defined(USE_AURA)
 // static
 BrowserView* BrowserView::GetBrowserViewForNativeWindow(
     gfx::NativeWindow window) {
-#if defined(USE_AURA)
-  // TODO(beng):
-  NOTIMPLEMENTED();
-#elif defined(OS_WIN)
-  if (IsWindow(window)) {
-    return reinterpret_cast<BrowserView*>(
-        ui::ViewProp::GetValue(window, kBrowserViewKey));
-  }
-#else
-  BrowserView* browser_view = NULL;
-  if (window) {
-    browser_view = static_cast<BrowserView*>(
-        g_object_get_data(G_OBJECT(window), kBrowserViewKey));
+  return IsWindow(window) ? reinterpret_cast<BrowserView*>(
+      ui::ViewProp::GetValue(window, kBrowserViewKey)) : NULL;
+}
+#endif
 
-#if defined(TOUCH_UI)
-    if (!browser_view) {
-      // With views-desktop, we cannot determine the BrowserView from the
-      // NativeWindow. So do the next best thing, and assume the last active
-      // BrowserView is what we want.
-      Browser* browser = BrowserList::GetLastActive();
-      if (browser && !browser->is_type_popup() && !browser->is_type_panel())
-        browser_view = reinterpret_cast<BrowserView*>(browser->window());
-    }
-#endif
-  }
-  return browser_view;
-#endif
-  return NULL;
+// static
+BrowserView* BrowserView::GetBrowserViewForBrowser(Browser* browser) {
+  return static_cast<BrowserView*>(browser->window());
 }
 
 gfx::Rect BrowserView::GetToolbarBounds() const {
   gfx::Rect toolbar_bounds(toolbar_->bounds());
   if (toolbar_bounds.IsEmpty())
     return toolbar_bounds;
   // When using vertical tabs, the toolbar appears to extend behind the tab
   // column.
   if (UseVerticalTabs())
     toolbar_bounds.Inset(tabstrip_->x() - toolbar_bounds.x(), 0, 0, 0);
@@ skipping 738 matching lines @@
 }
 
 void BrowserView::TabContentsFocused(TabContents* tab_contents) {
   contents_container_->TabContentsFocused(tab_contents);
 }
 
 void BrowserView::ShowPageInfo(Profile* profile,
                                const GURL& url,
                                const NavigationEntry::SSLStatus& ssl,
                                bool show_history) {
-  gfx::NativeWindow parent = GetWidget()->GetNativeWindow();
-
-  browser::ShowPageInfoBubble(parent, profile, url, ssl, show_history);
+  browser::ShowPageInfoBubble(browser_.get(), profile, url, ssl, show_history);
 }
 
 void BrowserView::ShowAppMenu() {
   toolbar_->app_menu()->Activate();
 }
 
 bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
                                          bool* is_keyboard_shortcut) {
   if (event.type != WebKit::WebInputEvent::RawKeyDown)
     return false;
@@ skipping 1429 matching lines @@
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   // Create the view and the frame. The frame will attach itself via the view
   // so we don't need to do anything with the pointer.
   BrowserView* view = new BrowserView(browser);
   (new BrowserFrame(view))->InitBrowserFrame();
   view->GetWidget()->non_client_view()->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   return view;
 }
 #endif