summaryrefslogtreecommitdiffstats
path: root/content/test/test_web_contents_view.h
diff options
context:
space:
mode:
authorsail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-12 18:09:43 +0000
committersail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-12 18:09:43 +0000
commite41cd197677108d3bf9e7324ce5d5353f33af5e0 (patch)
treeace3e69a01c27acd4de57bece27247f9733d58ea /content/test/test_web_contents_view.h
parent9109f8a1793261879779748deca96427215a38cc (diff)
downloadchromium_src-e41cd197677108d3bf9e7324ce5d5353f33af5e0.zip
chromium_src-e41cd197677108d3bf9e7324ce5d5353f33af5e0.tar.gz
chromium_src-e41cd197677108d3bf9e7324ce5d5353f33af5e0.tar.bz2
Set AllowOverlappingViews for history overlay
In r204580 I changed AllowOverlappingViews to only be set when necessary. This caused the history overlay to no longer be visible. Fix was to also check the hisotry overlay state when setting AllowOverlappingViews. BUG=236460, 248169 TEST=Navigate to http://www.webkit.org/blog-files/3d-transforms/poster-circle.html Then navigate to google.com. Swipe back to the first page. Swipe forward to the second page. Without my patch the back and forward arrows are not visible. With my patch the arrows are visible. NOTRY=true Review URL: https://chromiumcodereview.appspot.com/16632009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205871 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/test_web_contents_view.h')
-rw-r--r--content/test/test_web_contents_view.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/content/test/test_web_contents_view.h b/content/test/test_web_contents_view.h
index 84cc5d6..c9ba9af 100644
--- a/content/test/test_web_contents_view.h
+++ b/content/test/test_web_contents_view.h
@@ -52,6 +52,7 @@ class TestWebContentsView : public WebContentsViewPort,
virtual gfx::Rect GetViewBounds() const OVERRIDE;
#if defined(OS_MACOSX)
virtual void SetAllowOverlappingViews(bool overlapping) OVERRIDE;
+ virtual bool GetAllowOverlappingViews() const OVERRIDE;
#endif
// WebContentsViewPort: