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

Unified Diff: chrome/browser/ui/views/frame/browser_view_layout_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_layout_unittest.cc
diff --git a/chrome/browser/ui/views/frame/browser_view_layout_unittest.cc b/chrome/browser/ui/views/frame/browser_view_layout_unittest.cc
index 343892b392f0aa33ee28fac71cd61793ec4df9e9..5e7c9b2566da48ddc1af190dd70a2ea343d5640d 100644
--- a/chrome/browser/ui/views/frame/browser_view_layout_unittest.cc
+++ b/chrome/browser/ui/views/frame/browser_view_layout_unittest.cc
@@ -6,7 +6,7 @@
#include "chrome/browser/ui/views/frame/browser_view.h"
#include "chrome/browser/ui/views/frame/browser_view_layout_delegate.h"
-#include "chrome/browser/ui/views/frame/contents_container.h"
+#include "chrome/browser/ui/views/frame/contents_layout_manager.h"
#include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
#include "chrome/browser/ui/views/infobars/infobar_container_view.h"
#include "chrome/browser/ui/views/tabs/tab_strip.h"
@@ -135,9 +135,9 @@ class BrowserViewLayoutTest : public BrowserWithTestWindowTest {
tab_strip_(NULL),
toolbar_(NULL),
infobar_container_(NULL),
- contents_split_(NULL),
contents_container_(NULL),
- active_web_view_(NULL) {}
+ contents_web_view_(NULL),
+ devtools_web_view_(NULL) {}
virtual ~BrowserViewLayoutTest() {}
BrowserViewLayout* layout() { return layout_.get(); }
@@ -147,8 +147,7 @@ class BrowserViewLayoutTest : public BrowserWithTestWindowTest {
TabStrip* tab_strip() { return tab_strip_; }
MockView* toolbar() { return toolbar_; }
InfoBarContainerView* infobar_container() { return infobar_container_; }
- MockView* contents_split() { return contents_split_; }
- ContentsContainer* contents_container() { return contents_container_; }
+ MockView* contents_container() { return contents_container_; }
// BrowserWithTestWindowTest overrides:
virtual void SetUp() OVERRIDE {
@@ -168,11 +167,18 @@ class BrowserViewLayoutTest : public BrowserWithTestWindowTest {
infobar_container_ = new InfoBarContainerView(NULL);
root_view_->AddChildView(infobar_container_);
- contents_split_ = new MockView(gfx::Size(800, 600));
- active_web_view_ = new MockView(gfx::Size(800, 600));
- contents_container_ = new ContentsContainer(active_web_view_);
- contents_split_->AddChildView(contents_container_);
- root_view_->AddChildView(contents_split_);
+ contents_web_view_ = new MockView(gfx::Size(800, 600));
+ devtools_web_view_ = new MockView(gfx::Size(800, 600));
+ devtools_web_view_->SetVisible(false);
+
+ contents_container_ = new MockView(gfx::Size(800, 600));
+ contents_container_->AddChildView(devtools_web_view_);
+ contents_container_->AddChildView(contents_web_view_);
+ ContentsLayoutManager* contents_layout_manager =
+ new ContentsLayoutManager(devtools_web_view_, contents_web_view_);
+ contents_container_->SetLayoutManager(contents_layout_manager);
+
+ root_view_->AddChildView(contents_container_);
// TODO(jamescook): Attach |layout_| to |root_view_|?
layout_.reset(new BrowserViewLayout);
@@ -184,8 +190,8 @@ class BrowserViewLayoutTest : public BrowserWithTestWindowTest {
tab_strip_,
toolbar_,
infobar_container_,
- contents_split_,
contents_container_,
+ contents_layout_manager,
immersive_mode_controller_.get());
}
@@ -199,9 +205,9 @@ class BrowserViewLayoutTest : public BrowserWithTestWindowTest {
TabStrip* tab_strip_;
MockView* toolbar_;
InfoBarContainerView* infobar_container_;
- MockView* contents_split_;
- ContentsContainer* contents_container_;
- MockView* active_web_view_;
+ MockView* contents_container_;
+ MockView* contents_web_view_;
+ MockView* devtools_web_view_;
scoped_ptr<MockImmersiveModeController> immersive_mode_controller_;
@@ -228,7 +234,7 @@ TEST_F(BrowserViewLayoutTest, Layout) {
EXPECT_EQ("0,0 800x0", toolbar()->bounds().ToString());
EXPECT_EQ("0,0 800x0", infobar_container()->bounds().ToString());
// Contents split fills the window.
- EXPECT_EQ("0,0 800x600", contents_split()->bounds().ToString());
+ EXPECT_EQ("0,0 800x600", contents_container()->bounds().ToString());
// Turn on the toolbar, like in a pop-up window.
delegate()->set_toolbar_visible(true);
@@ -238,7 +244,7 @@ TEST_F(BrowserViewLayoutTest, Layout) {
EXPECT_EQ("0,0 0x0", tab_strip()->bounds().ToString());
EXPECT_EQ("0,0 800x30", toolbar()->bounds().ToString());
EXPECT_EQ("0,30 800x0", infobar_container()->bounds().ToString());
- EXPECT_EQ("0,30 800x570", contents_split()->bounds().ToString());
+ EXPECT_EQ("0,30 800x570", contents_container()->bounds().ToString());
// TODO(jamescook): Tab strip and bookmark bar.
}
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view_layout.cc ('k') | chrome/browser/ui/views/frame/browser_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698