views: Cleanup BrowserView function order and variable names

chrome/browser/ui/views/frame/browser_view_layout.cc

 // Copyright 2012 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_layout.h"
 
 #include "base/observer_list.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
@@ skipping 270 matching lines @@
 
 void BrowserViewLayout::Uninstalled(views::View* host) {}
 
 void BrowserViewLayout::ViewAdded(views::View* host, views::View* view) {
   switch (view->id()) {
     case VIEW_ID_CONTENTS_SPLIT: {
       contents_split_ = static_cast<views::SingleSplitView*>(view);
       // We're installed as the LayoutManager before BrowserView creates the
       // contents, so we have to set contents_container_ here rather than in
       // Installed.
-      contents_container_ = browser_view_->contents_;
+      contents_container_ = browser_view_->contents_container_;
       break;
     }
     case VIEW_ID_DOWNLOAD_SHELF:
       download_shelf_ = static_cast<DownloadShelfView*>(view);
       break;
   }
 }
 
 void BrowserViewLayout::Layout(views::View* host) {
   // Showing Instant extended suggestions causes us to temporarily hide any
   // visible bookmark bar and infobars.  In turn, this hiding would normally
   // cause the content below the suggestions to shift upwards, which looks
   // surprising (since from the user's perspective, we're "covering" rather than
   // "removing" the bookmark bar/infobars).  To prevent this, we save off the
   // content origin here, then once we finish laying things out, force the
   // contents to continue to display from that origin.  If suggestions
   // completely obscure the tab's contents, there's no need to modify the
   // content origin.
-  views::WebView* contents = browser_view_->contents_container_;
+  views::WebView* contents = browser_view_->contents_web_view_;
   int overlay_height = contents_container_->overlay_height();
   gfx::Point old_contents_origin;
   if (overlay_height > 0 && !contents_container_->IsOverlayFullHeight()) {
     old_contents_origin = contents->bounds().origin();
     views::View::ConvertPointToTarget(contents->parent(), browser_view_,
                                       &old_contents_origin);
   }
 
   vertical_layout_rect_ = browser_view_->GetLocalBounds();
   int top = LayoutTabStripRegion();
@@ skipping 309 matching lines @@
   }
   return bottom;
 }
 
 bool BrowserViewLayout::InfobarVisible() const {
   views::View* infobar_container = browser_view_->infobar_container_;
   // NOTE: Can't check if the size IsEmpty() since it's always 0-width.
   return browser()->SupportsWindowFeature(Browser::FEATURE_INFOBAR) &&
       (infobar_container->GetPreferredSize().height() != 0);
 }