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..5f0ec1fbb437923c942a88e933d22ff44cb1a09e 100644 |
--- a/chrome/browser/ui/views/frame/browser_view_layout_unittest.cc |
+++ b/chrome/browser/ui/views/frame/browser_view_layout_unittest.cc |
@@ -7,6 +7,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/devtools_container.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,8 +136,8 @@ class BrowserViewLayoutTest : public BrowserWithTestWindowTest { |
tab_strip_(NULL), |
toolbar_(NULL), |
infobar_container_(NULL), |
- contents_split_(NULL), |
contents_container_(NULL), |
+ devtools_container_(NULL), |
active_web_view_(NULL) {} |
virtual ~BrowserViewLayoutTest() {} |
@@ -147,8 +148,8 @@ 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_; } |
+ DevToolsContainer* devtools_container() { return devtools_container_; } |
// BrowserWithTestWindowTest overrides: |
virtual void SetUp() OVERRIDE { |
@@ -168,11 +169,13 @@ 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_); |
+ devtools_view_ = new MockView(gfx::Size(800, 600)); |
+ devtools_view_->SetVisible(false); |
+ devtools_container_ = |
+ new DevToolsContainer(active_web_view_, devtools_view_); |
+ contents_container_ = new ContentsContainer(devtools_container_); |
+ root_view_->AddChildView(contents_container_); |
// TODO(jamescook): Attach |layout_| to |root_view_|? |
layout_.reset(new BrowserViewLayout); |
@@ -184,7 +187,6 @@ class BrowserViewLayoutTest : public BrowserWithTestWindowTest { |
tab_strip_, |
toolbar_, |
infobar_container_, |
- contents_split_, |
contents_container_, |
immersive_mode_controller_.get()); |
} |
@@ -199,9 +201,10 @@ class BrowserViewLayoutTest : public BrowserWithTestWindowTest { |
TabStrip* tab_strip_; |
MockView* toolbar_; |
InfoBarContainerView* infobar_container_; |
- MockView* contents_split_; |
ContentsContainer* contents_container_; |
+ DevToolsContainer* devtools_container_; |
MockView* active_web_view_; |
+ MockView* devtools_view_; |
scoped_ptr<MockImmersiveModeController> immersive_mode_controller_; |
@@ -228,7 +231,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 +241,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. |
} |