Converts usage of GetBrowserViewForNativeWindow to

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 77 matching lines @@
  public:
   // The browser view's class name.
   static const char kViewClassName[];
 
   explicit BrowserView(Browser* browser);
   virtual ~BrowserView();
 
   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(); }
 
   // Returns the apparent bounds of the toolbar, in BrowserView coordinates.
   // These differ from |toolbar_.bounds()| in that they match where the toolbar
   // background image is drawn -- slightly outside the "true" bounds
   // horizontally, and, when using vertical tabs, behind the tab column. Note
   // that this returns the bounds for the toolbar area.
   virtual gfx::Rect GetToolbarBounds() const;
@@ skipping 584 matching lines @@
   base::TimeTicks last_animation_time_;
 
   // If this flag is set then SetFocusToLocationBar() will set focus to the
   // location bar even if the browser window is not active.
   bool force_location_bar_focus_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_