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 09226bae8f8869d06d88679b0c2e06db1634a409..7227c68b534f9fc84e6a17b28186914a64657cc5 100644 |
--- a/chrome/browser/ui/views/frame/browser_view_layout_unittest.cc |
+++ b/chrome/browser/ui/views/frame/browser_view_layout_unittest.cc |
@@ -12,6 +12,7 @@ |
#include "chrome/browser/ui/views/tabs/tab_strip.h" |
#include "chrome/test/base/browser_with_test_window_test.h" |
#include "testing/gtest/include/gtest/gtest.h" |
+#include "ui/views/controls/webview/webview.h" |
class MockBrowserViewLayoutDelegate : public BrowserViewLayoutDelegate { |
public: |
@@ -94,6 +95,28 @@ class MockView : public views::View { |
DISALLOW_COPY_AND_ASSIGN(MockView); |
}; |
+// A simple web view that prefers an initial size. |
+class MockWebView : public views::WebView { |
+ public: |
+ explicit MockWebView(gfx::Size initial_size) |
+ : views::WebView(NULL), |
+ size_(initial_size) { |
+ SetBoundsRect(gfx::Rect(gfx::Point(), size_)); |
+ } |
+ virtual ~MockWebView() {} |
+ |
+ // views::View overrides: |
+ virtual gfx::Size GetPreferredSize() OVERRIDE { |
+ return size_; |
+ } |
+ |
+ private: |
+ gfx::Size size_; |
+ |
+ DISALLOW_COPY_AND_ASSIGN(MockWebView); |
+}; |
+ |
+ |
/////////////////////////////////////////////////////////////////////////////// |
class MockImmersiveModeController : public ImmersiveModeController { |
@@ -165,7 +188,7 @@ class BrowserViewLayoutTest : public BrowserWithTestWindowTest { |
root_view_->AddChildView(infobar_container_); |
contents_split_ = new MockView(gfx::Size(800, 600)); |
- active_web_view_ = new MockView(gfx::Size(800, 600)); |
+ active_web_view_ = new MockWebView(gfx::Size(800, 600)); |
contents_container_ = new ContentsContainer(active_web_view_); |
contents_split_->AddChildView(contents_container_); |
root_view_->AddChildView(contents_split_); |
@@ -197,7 +220,7 @@ class BrowserViewLayoutTest : public BrowserWithTestWindowTest { |
InfoBarContainerView* infobar_container_; |
MockView* contents_split_; |
ContentsContainer* contents_container_; |
- MockView* active_web_view_; |
+ MockWebView* active_web_view_; |
scoped_ptr<MockImmersiveModeController> immersive_mode_controller_; |