DevTools: place DevTools WebContents underneath inspected WebContents.

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

 // Copyright 2013 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.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/browser/ui/views/frame/browser_view_layout.h"
@@ skipping 49 matching lines @@
 
 // Test layout of the top-of-window UI.
 TEST_F(BrowserViewTest, BrowserViewLayout) {
   BookmarkBarView::DisableAnimationsForTesting(true);
 
   // |browser_view_| owns the Browser, not the test class.
   Browser* browser = browser_view()->browser();
   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"));
 
   // Verify the view hierarchy.
   EXPECT_EQ(top_container, browser_view()->tabstrip()->parent());
   EXPECT_EQ(top_container, browser_view()->toolbar()->parent());
   EXPECT_EQ(top_container, browser_view()->GetBookmarkBarView()->parent());
   EXPECT_EQ(browser_view(), browser_view()->infobar_container()->parent());
 
@@ skipping 10 matching lines @@
   EXPECT_EQ(browser_view()->width(), top_container->width());
   // Tabstrip layout varies based on window frame sizes.
   gfx::Point expected_tabstrip_origin = ExpectedTabStripOrigin(browser_view());
   EXPECT_EQ(expected_tabstrip_origin.x(), tabstrip->x());
   EXPECT_EQ(expected_tabstrip_origin.y(), tabstrip->y());
   EXPECT_EQ(0, toolbar->x());
   EXPECT_EQ(
       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());
 
   // Verify bookmark bar visibility.
   BookmarkBarView* bookmark_bar = browser_view()->GetBookmarkBarView();
   EXPECT_FALSE(bookmark_bar->visible());
   EXPECT_FALSE(bookmark_bar->IsDetached());
   chrome::ExecuteCommand(browser, IDC_SHOW_BOOKMARK_BAR);
   EXPECT_TRUE(bookmark_bar->visible());
   EXPECT_FALSE(bookmark_bar->IsDetached());
@@ skipping 16 matching lines @@
             browser_view()->GetIndexOf(top_container));
 
   // Bookmark bar layout on NTP.
   EXPECT_EQ(0, bookmark_bar->x());
   EXPECT_EQ(
       tabstrip->bounds().bottom() +
           toolbar->height() -
           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.
   NavigateAndCommitActiveTabWithTitle(browser,
                                       GURL("about:blank"),
                                       base::string16());
   EXPECT_FALSE(bookmark_bar->visible());
   EXPECT_FALSE(bookmark_bar->IsDetached());
   EXPECT_EQ(top_container, bookmark_bar->parent());
   // Top container is still second from front.
@@ skipping 84 matching lines @@
   // Test initial state.
   EXPECT_TRUE(browser_view()->IsTabStripVisible());
   // Validate whether the window switcher button is the target for the position
   // passed in.
   gfx::Point switcher_point(browser_view()->window_switcher_button()->x() + 2,
                             browser_view()->window_switcher_button()->y());
   EXPECT_EQ(browser_view()->GetEventHandlerForPoint(switcher_point),
             browser_view()->window_switcher_button());
 }
 #endif