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

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

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_unittest.cc
diff --git a/chrome/browser/ui/views/frame/browser_view_unittest.cc b/chrome/browser/ui/views/frame/browser_view_unittest.cc
index ee53aaacceb3f57a99af521cbe3fe4afcd14eefe..abfd85504471a0034f5f06ffbb3dec573ad48a1e 100644
--- a/chrome/browser/ui/views/frame/browser_view_unittest.cc
+++ b/chrome/browser/ui/views/frame/browser_view_unittest.cc
@@ -67,10 +67,12 @@ TEST_F(BrowserViewTest, BrowserViewLayout) {
TopContainerView* top_container = browser_view()->top_container();
TabStrip* tabstrip = browser_view()->tabstrip();
ToolbarView* toolbar = browser_view()->toolbar();
- views::SingleSplitView* contents_split =
- browser_view()->GetContentsSplitForTest();
+ views::View* contents_container =
+ browser_view()->GetContentsContainerForTest();
views::WebView* contents_web_view =
browser_view()->GetContentsWebViewForTest();
+ views::WebView* devtools_web_view =
+ browser_view()->GetDevToolsWebViewForTest();
// Start with a single tab open to a normal page.
AddTab(browser, GURL("about:blank"));
@@ -101,8 +103,10 @@ TEST_F(BrowserViewTest, BrowserViewLayout) {
tabstrip->bounds().bottom() -
BrowserViewLayout::kToolbarTabStripVerticalOverlap,
toolbar->y());
- EXPECT_EQ(0, contents_split->x());
- EXPECT_EQ(toolbar->bounds().bottom(), contents_split->y());
+ EXPECT_EQ(0, contents_container->x());
+ EXPECT_EQ(toolbar->bounds().bottom(), contents_container->y());
+ EXPECT_EQ(0, devtools_web_view->x());
+ EXPECT_EQ(0, devtools_web_view->y());
EXPECT_EQ(0, contents_web_view->x());
EXPECT_EQ(0, contents_web_view->y());
@@ -139,10 +143,13 @@ TEST_F(BrowserViewTest, BrowserViewLayout) {
BrowserViewLayout::kToolbarTabStripVerticalOverlap -
views::NonClientFrameView::kClientEdgeThickness,
bookmark_bar->y());
- EXPECT_EQ(toolbar->bounds().bottom(), contents_split->y());
+ EXPECT_EQ(toolbar->bounds().bottom(), contents_container->y());
// Contents view has a "top margin" pushing it below the bookmark bar.
EXPECT_EQ(bookmark_bar->height() -
views::NonClientFrameView::kClientEdgeThickness,
+ devtools_web_view->y());
+ EXPECT_EQ(bookmark_bar->height() -
+ views::NonClientFrameView::kClientEdgeThickness,
contents_web_view->y());
// Bookmark bar is parented back to top container on normal page.
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view_layout_unittest.cc ('k') | chrome/browser/ui/views/frame/contents_container.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698