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

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

Issue 63173016: DevTools: place DevTools WebContents underneath inspected WebContents. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 7 years 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
Index: chrome/browser/ui/views/frame/browser_view_layout.h
diff --git a/chrome/browser/ui/views/frame/browser_view_layout.h b/chrome/browser/ui/views/frame/browser_view_layout.h
index 5807bf53c08ef779b91116a8fb344157198b0e06..98ed8bff51a5dd6497e522f663435caf62d64304 100644
--- a/chrome/browser/ui/views/frame/browser_view_layout.h
+++ b/chrome/browser/ui/views/frame/browser_view_layout.h
@@ -15,7 +15,7 @@
class BookmarkBarView;
class Browser;
class BrowserViewLayoutDelegate;
-class ContentsContainer;
+class ContentsLayoutManager;
class ImmersiveModeController;
class InfoBarContainerView;
class TabContentsContainer;
@@ -53,8 +53,8 @@ class BrowserViewLayout : public views::LayoutManager {
TabStrip* tab_strip,
views::View* toolbar,
InfoBarContainerView* infobar_container,
- views::View* contents_split,
- ContentsContainer* contents_container,
+ views::View* contents_container,
+ ContentsLayoutManager* contents_layout_manager,
ImmersiveModeController* immersive_mode_controller);
// Sets or updates views that are not available when |this| is initialized.
@@ -102,10 +102,10 @@ class BrowserViewLayout : public views::LayoutManager {
int LayoutBookmarkBar(int top);
int LayoutInfoBar(int top);
- // Layout the |contents_split_| view between the coordinates |top| and
+ // Layout the |contents_container_| view between the coordinates |top| and
// |bottom|. See browser_view.h for details of the relationship between
- // |contents_split_| and other views.
- void LayoutContentsSplitView(int top, int bottom);
+ // |contents_container_| and other views.
+ void LayoutContentsContainerView(int top, int bottom);
// Updates |top_container_|'s bounds. The new bounds depend on the size of
// the bookmark bar and the toolbar.
@@ -144,8 +144,8 @@ class BrowserViewLayout : public views::LayoutManager {
views::View* toolbar_;
BookmarkBarView* bookmark_bar_;
InfoBarContainerView* infobar_container_;
- views::View* contents_split_;
- ContentsContainer* contents_container_;
+ views::View* contents_container_;
+ ContentsLayoutManager* contents_layout_manager_;
views::View* download_shelf_;
ImmersiveModeController* immersive_mode_controller_;
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc ('k') | chrome/browser/ui/views/frame/browser_view_layout.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698