Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4220)

Unified Diff: chrome/browser/ui/views/frame/browser_view_layout.cc

Issue 14205026: views: Cleanup BrowserView function order and variable names (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/frame/browser_view_layout.cc
diff --git a/chrome/browser/ui/views/frame/browser_view_layout.cc b/chrome/browser/ui/views/frame/browser_view_layout.cc
index 3472c4268aa6aed3079d6d2efa010ecc231aba6b..abeb7a2c08512d84a49f06b7709ae4df6197000e 100644
--- a/chrome/browser/ui/views/frame/browser_view_layout.cc
+++ b/chrome/browser/ui/views/frame/browser_view_layout.cc
@@ -288,7 +288,7 @@ void BrowserViewLayout::ViewAdded(views::View* host, views::View* 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:
@@ -307,7 +307,7 @@ void BrowserViewLayout::Layout(views::View* host) {
// 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()) {
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698