Commit 574d5ba4 authored by Avi Drissman's avatar Avi Drissman Committed by Commit Bot

Followup to WebContents fullscreen cleanup.

One last name that needs to be changed. I missed this one.

Bug: 1100727
Change-Id: I1bd327b355cf4d040438e0b1a4baf11fc8914061
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2276655
Commit-Queue: Avi Drissman <avi@chromium.org>
Commit-Queue: Leonard Grey <lgrey@chromium.org>
Auto-Submit: Avi Drissman <avi@chromium.org>
Reviewed-by: default avatarLeonard Grey <lgrey@chromium.org>
Cr-Commit-Position: refs/heads/master@{#784173}
parent 6c488cbc
...@@ -402,11 +402,9 @@ class MockRenderWidgetHostDelegate : public RenderWidgetHostDelegate { ...@@ -402,11 +402,9 @@ class MockRenderWidgetHostDelegate : public RenderWidgetHostDelegate {
ignore_input_events_ = ignore_input_events; ignore_input_events_ = ignore_input_events;
} }
bool IsFullscreen() override { return is_fullscreen_for_tab_; } bool IsFullscreen() override { return is_fullscreen_; }
void set_is_fullscreen_for_current_tab(bool enabled) { void set_is_fullscreen(bool enabled) { is_fullscreen_ = enabled; }
is_fullscreen_for_tab_ = enabled;
}
protected: protected:
KeyboardEventProcessingResult PreHandleKeyboardEvent( KeyboardEventProcessingResult PreHandleKeyboardEvent(
...@@ -478,7 +476,7 @@ class MockRenderWidgetHostDelegate : public RenderWidgetHostDelegate { ...@@ -478,7 +476,7 @@ class MockRenderWidgetHostDelegate : public RenderWidgetHostDelegate {
viz::VerticalScrollDirection last_vertical_scroll_direction_ = viz::VerticalScrollDirection last_vertical_scroll_direction_ =
viz::VerticalScrollDirection::kNull; viz::VerticalScrollDirection::kNull;
bool is_fullscreen_for_tab_ = false; bool is_fullscreen_ = false;
}; };
class MockRenderWidgetHostOwnerDelegate class MockRenderWidgetHostOwnerDelegate
...@@ -1034,7 +1032,7 @@ TEST_F(RenderWidgetHostTest, OverrideScreenInfoDuringFullscreenMode) { ...@@ -1034,7 +1032,7 @@ TEST_F(RenderWidgetHostTest, OverrideScreenInfoDuringFullscreenMode) {
EXPECT_EQ(kScreenBounds, props.screen_info.available_rect); EXPECT_EQ(kScreenBounds, props.screen_info.available_rect);
// Enter fullscreen and do another VisualProperties sync. // Enter fullscreen and do another VisualProperties sync.
delegate_->set_is_fullscreen_for_current_tab(true); delegate_->set_is_fullscreen(true);
host_->SynchronizeVisualPropertiesIgnoringPendingAck(); host_->SynchronizeVisualPropertiesIgnoringPendingAck();
// WidgetMsg_UpdateVisualProperties sent to the renderer. // WidgetMsg_UpdateVisualProperties sent to the renderer.
ASSERT_EQ(2u, sink_->message_count()); ASSERT_EQ(2u, sink_->message_count());
...@@ -1045,7 +1043,7 @@ TEST_F(RenderWidgetHostTest, OverrideScreenInfoDuringFullscreenMode) { ...@@ -1045,7 +1043,7 @@ TEST_F(RenderWidgetHostTest, OverrideScreenInfoDuringFullscreenMode) {
EXPECT_EQ(kViewBounds.size(), props.screen_info.available_rect.size()); EXPECT_EQ(kViewBounds.size(), props.screen_info.available_rect.size());
// Exit fullscreen and do another VisualProperties sync. // Exit fullscreen and do another VisualProperties sync.
delegate_->set_is_fullscreen_for_current_tab(false); delegate_->set_is_fullscreen(false);
host_->SynchronizeVisualPropertiesIgnoringPendingAck(); host_->SynchronizeVisualPropertiesIgnoringPendingAck();
// WidgetMsg_UpdateVisualProperties sent to the renderer. // WidgetMsg_UpdateVisualProperties sent to the renderer.
ASSERT_EQ(3u, sink_->message_count()); ASSERT_EQ(3u, sink_->message_count());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment