Converts usage of GetBrowserViewForNativeWindow to

chrome/browser/ui/views/frame/browser_view.h

Index: chrome/browser/ui/views/frame/browser_view.h
diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h
index 713333e423dd81c212d61f23081291e1acfad0fa..567eba8e59d6e2b11d85319c6a041e23a499cefd 100644
--- a/chrome/browser/ui/views/frame/browser_view.h
+++ b/chrome/browser/ui/views/frame/browser_view.h
@@ -95,10 +95,18 @@ class BrowserView : public BrowserBubbleHost,
   void set_frame(BrowserFrame* frame) { frame_ = frame; }
   BrowserFrame* frame() const { return frame_; }
 
+#if defined(OS_WIN) && !defined(USE_AURA)
   // Returns a pointer to the BrowserView* interface implementation (an
   // instance of this object, typically) for a given native window, or NULL if
   // there is no such association.
+  //
+  // Don't use this unless you only have a NativeWindow. In nearly all
+  // situations plumb through browser and use it.
   static BrowserView* GetBrowserViewForNativeWindow(gfx::NativeWindow window);
+#endif
+
+  // Returns the BrowserView used for the specified Browser.
+  static BrowserView* GetBrowserViewForBrowser(Browser* browser);
 
   // Returns a Browser instance of this view.
   Browser* browser() const { return browser_.get(); }