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

Unified Diff: content/browser/web_contents/web_contents_impl_browsertest.cc

Issue 964403003: Make it possible to set the display mode from Chromium (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Re-enable test for Android, force "was resized" IPC message there. Created 5 years, 8 months 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
« no previous file with comments | « content/browser/web_contents/web_contents_impl.cc ('k') | content/common/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/web_contents_impl_browsertest.cc
diff --git a/content/browser/web_contents/web_contents_impl_browsertest.cc b/content/browser/web_contents/web_contents_impl_browsertest.cc
index 8cdfedfaa3c6d52715b2164eed65138b1b6c88f1..a40f74186c379d4aed55335dbd6a7975684ec8fa 100644
--- a/content/browser/web_contents/web_contents_impl_browsertest.cc
+++ b/content/browser/web_contents/web_contents_impl_browsertest.cc
@@ -5,6 +5,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "content/browser/frame_host/navigation_entry_impl.h"
+#include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/browser/web_contents/web_contents_impl.h"
#include "content/browser/web_contents/web_contents_view.h"
#include "content/common/frame_messages.h"
@@ -50,6 +51,10 @@ void ResizeWebContentsView(Shell* shell, const gfx::Size& size,
class WebContentsImplBrowserTest : public ContentBrowserTest {
public:
WebContentsImplBrowserTest() {}
+ void SetUp() override {
+ RenderWidgetHostImpl::DisableResizeAckCheckForTesting();
+ ContentBrowserTest::SetUp();
+ }
private:
DISALLOW_COPY_AND_ASSIGN(WebContentsImplBrowserTest);
@@ -641,4 +646,46 @@ IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest,
ASSERT_TRUE(observer->did_fist_visually_non_empty_paint_);
}
+namespace {
+
+class WebDisplayModeDelegate : public WebContentsDelegate {
+ public:
+ explicit WebDisplayModeDelegate(blink::WebDisplayMode mode) : mode_(mode) { }
+ ~WebDisplayModeDelegate() override { }
+
+ blink::WebDisplayMode GetDisplayMode(
+ const WebContents* source) const override { return mode_; }
+ void set_mode(blink::WebDisplayMode mode) { mode_ = mode; }
+ private:
+ blink::WebDisplayMode mode_;
+
+ DISALLOW_COPY_AND_ASSIGN(WebDisplayModeDelegate);
+};
+
+}
+
+IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest, ChangeDisplayMode) {
+ ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+ WebDisplayModeDelegate delegate(blink::WebDisplayModeMinimalUi);
+ shell()->web_contents()->SetDelegate(&delegate);
+
+ NavigateToURL(shell(), GURL("about://blank"));
+
+ ASSERT_TRUE(ExecuteScript(shell()->web_contents(),
+ "document.title = "
+ " window.matchMedia('(display-mode:"
+ " minimal-ui)').matches"));
+ EXPECT_EQ(base::ASCIIToUTF16("true"), shell()->web_contents()->GetTitle());
+
+ delegate.set_mode(blink::WebDisplayModeFullscreen);
+ // Simulate widget is entering fullscreen (changing size is enough).
+ shell()->web_contents()->GetRenderViewHost()->WasResized();
+
+ ASSERT_TRUE(ExecuteScript(shell()->web_contents(),
+ "document.title = "
+ " window.matchMedia('(display-mode:"
+ " fullscreen)').matches"));
+ EXPECT_EQ(base::ASCIIToUTF16("true"), shell()->web_contents()->GetTitle());
+}
+
} // namespace content
« no previous file with comments | « content/browser/web_contents/web_contents_impl.cc ('k') | content/common/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698