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

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

Issue 6121007: Revert 71230 to see if it is related to hang on linux interactive_ui_tests.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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') | chrome/browser/ui/views/frame/browser_view_layout.cc » ('j') | 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.h
===================================================================
--- chrome/browser/ui/views/frame/browser_view_layout.h (revision 71251)
+++ chrome/browser/ui/views/frame/browser_view_layout.h (working copy)
@@ -14,13 +14,8 @@
class BrowserView;
class ContentsContainer;
class DownloadShelfView;
-class TabContentsContainer;
class ToolbarView;
-namespace views {
-class SingleSplitView;
-}
-
// The layout manager used in chrome browser.
class BrowserViewLayout : public views::LayoutManager {
public:
@@ -66,15 +61,6 @@
int LayoutBookmarkBar(int top);
int LayoutInfoBar(int top);
- // Updates |source|'s reserved contents rect by mapping BrowserView's
- // |browser_reserved_rect| into |future_source_bounds| taking into
- // account |source|'s |future_parent_offset| (offset is relative to
- // browser_view_).
- void UpdateReservedContentsRect(const gfx::Rect& browser_reserved_rect,
- TabContentsContainer* source,
- const gfx::Rect& future_source_bounds,
- const gfx::Point& future_parent_offset);
-
// Layout the TabContents container, between the coordinates |top| and
// |bottom|.
void LayoutTabContents(int top, int bottom);
@@ -102,7 +88,7 @@
// Child views that the layout manager manages.
BaseTabStrip* tabstrip_;
ToolbarView* toolbar_;
- views::SingleSplitView* contents_split_;
+ views::View* contents_split_;
ContentsContainer* contents_container_;
views::View* infobar_container_;
DownloadShelfView* download_shelf_;
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.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