summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--content/browser/renderer_host/render_view_host_impl.cc2
-rw-r--r--content/browser/renderer_host/render_view_host_impl.h2
-rw-r--r--content/browser/renderer_host/render_widget_host_impl.cc7
-rw-r--r--content/browser/renderer_host/render_widget_host_impl.h5
-rw-r--r--content/browser/screen_orientation/screen_orientation_browsertest.cc2
-rw-r--r--content/browser/web_contents/web_contents_impl_unittest.cc18
-rw-r--r--content/common/view_messages.h4
-rw-r--r--content/public/test/render_view_test.cc4
-rw-r--r--content/renderer/pepper/pepper_plugin_instance_impl.cc2
-rw-r--r--content/renderer/render_frame_impl_browsertest.cc2
-rw-r--r--content/renderer/render_view_impl.cc4
-rw-r--r--content/renderer/render_widget.cc30
-rw-r--r--content/renderer/render_widget.h8
-rw-r--r--content/renderer/render_widget_browsertest.cc2
-rw-r--r--content/renderer/resizing_mode_selector.cc2
-rw-r--r--content/test/test_render_view_host.cc4
-rw-r--r--content/test/test_render_view_host.h2
17 files changed, 51 insertions, 49 deletions
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index 3a7af0c..4966274 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -1218,7 +1218,7 @@ void RenderViewHostImpl::RequestToLockMouse(bool user_gesture,
delegate_->RequestToLockMouse(user_gesture, last_unlocked_by_target);
}
-bool RenderViewHostImpl::IsFullscreen() const {
+bool RenderViewHostImpl::IsFullscreenGranted() const {
return delegate_->IsFullscreenForCurrentTab();
}
diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
index 3e6b015..470725a 100644
--- a/content/browser/renderer_host/render_view_host_impl.h
+++ b/content/browser/renderer_host/render_view_host_impl.h
@@ -327,7 +327,7 @@ class CONTENT_EXPORT RenderViewHostImpl
void OnRenderAutoResized(const gfx::Size& size) override;
void RequestToLockMouse(bool user_gesture,
bool last_unlocked_by_target) override;
- bool IsFullscreen() const override;
+ bool IsFullscreenGranted() const override;
void OnFocus() override;
void OnBlur() override;
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index fe0203f..7dcae5a 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -594,7 +594,7 @@ bool RenderWidgetHostImpl::GetResizeParams(
resize_params->top_controls_shrink_blink_size =
view_->DoTopControlsShrinkBlinkSize();
resize_params->visible_viewport_size = view_->GetVisibleViewportSize();
- resize_params->is_fullscreen = IsFullscreen();
+ resize_params->is_fullscreen_granted = IsFullscreenGranted();
}
const bool size_changed =
@@ -606,7 +606,8 @@ bool RenderWidgetHostImpl::GetResizeParams(
size_changed || screen_info_out_of_date_ ||
old_resize_params_->physical_backing_size !=
resize_params->physical_backing_size ||
- old_resize_params_->is_fullscreen != resize_params->is_fullscreen ||
+ old_resize_params_->is_fullscreen_granted !=
+ resize_params->is_fullscreen_granted ||
old_resize_params_->top_controls_height !=
resize_params->top_controls_height ||
old_resize_params_->top_controls_shrink_blink_size !=
@@ -1317,7 +1318,7 @@ bool RenderWidgetHostImpl::IsMouseLocked() const {
return view_ ? view_->IsMouseLocked() : false;
}
-bool RenderWidgetHostImpl::IsFullscreen() const {
+bool RenderWidgetHostImpl::IsFullscreenGranted() const {
return false;
}
diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
index bea0bfa..ecd86c5 100644
--- a/content/browser/renderer_host/render_widget_host_impl.h
+++ b/content/browser/renderer_host/render_widget_host_impl.h
@@ -539,8 +539,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
bool IsMouseLocked() const;
- // RenderViewHost overrides this method to report when in fullscreen mode.
- virtual bool IsFullscreen() const;
+ // RenderViewHost overrides this method to report whether tab-initiated
+ // fullscreen was granted.
+ virtual bool IsFullscreenGranted() const;
// Indicates if the render widget host should track the render widget's size
// as opposed to visa versa.
diff --git a/content/browser/screen_orientation/screen_orientation_browsertest.cc b/content/browser/screen_orientation/screen_orientation_browsertest.cc
index 4b1d40b..d7516cb 100644
--- a/content/browser/screen_orientation/screen_orientation_browsertest.cc
+++ b/content/browser/screen_orientation/screen_orientation_browsertest.cc
@@ -60,7 +60,7 @@ class ScreenOrientationBrowserTest : public ContentBrowserTest {
params.top_controls_height = 0.f;
params.top_controls_shrink_blink_size = false;
params.resizer_rect = gfx::Rect();
- params.is_fullscreen = false;
+ params.is_fullscreen_granted = false;
rwh->Send(new ViewMsg_Resize(rwh->GetRoutingID(), params));
}
diff --git a/content/browser/web_contents/web_contents_impl_unittest.cc b/content/browser/web_contents/web_contents_impl_unittest.cc
index 32f102d..bd12aa5 100644
--- a/content/browser/web_contents/web_contents_impl_unittest.cc
+++ b/content/browser/web_contents/web_contents_impl_unittest.cc
@@ -1298,12 +1298,12 @@ TEST_F(WebContentsImplTest, NavigationExitsFullscreen) {
EXPECT_EQ(orig_rfh, contents()->GetMainFrame());
// Toggle fullscreen mode on (as if initiated via IPC from renderer).
- EXPECT_FALSE(orig_rvh->IsFullscreen());
+ EXPECT_FALSE(orig_rvh->IsFullscreenGranted());
EXPECT_FALSE(contents()->IsFullscreenForCurrentTab());
EXPECT_FALSE(fake_delegate.IsFullscreenForTabOrPending(contents()));
orig_rfh->OnMessageReceived(
FrameHostMsg_ToggleFullscreen(orig_rfh->GetRoutingID(), true));
- EXPECT_TRUE(orig_rvh->IsFullscreen());
+ EXPECT_TRUE(orig_rvh->IsFullscreenGranted());
EXPECT_TRUE(contents()->IsFullscreenForCurrentTab());
EXPECT_TRUE(fake_delegate.IsFullscreenForTabOrPending(contents()));
@@ -1317,7 +1317,7 @@ TEST_F(WebContentsImplTest, NavigationExitsFullscreen) {
pending_rfh, 1, url2, ui::PAGE_TRANSITION_TYPED);
// Confirm fullscreen has exited.
- EXPECT_FALSE(orig_rvh->IsFullscreen());
+ EXPECT_FALSE(orig_rvh->IsFullscreenGranted());
EXPECT_FALSE(contents()->IsFullscreenForCurrentTab());
EXPECT_FALSE(fake_delegate.IsFullscreenForTabOrPending(contents()));
@@ -1348,7 +1348,7 @@ TEST_F(WebContentsImplTest, HistoryNavigationExitsFullscreen) {
EXPECT_EQ(orig_rfh, contents()->GetMainFrame());
// Sanity-check: Confirm we're not starting out in fullscreen mode.
- EXPECT_FALSE(orig_rvh->IsFullscreen());
+ EXPECT_FALSE(orig_rvh->IsFullscreenGranted());
EXPECT_FALSE(contents()->IsFullscreenForCurrentTab());
EXPECT_FALSE(fake_delegate.IsFullscreenForTabOrPending(contents()));
@@ -1356,7 +1356,7 @@ TEST_F(WebContentsImplTest, HistoryNavigationExitsFullscreen) {
// Toggle fullscreen mode on (as if initiated via IPC from renderer).
orig_rfh->OnMessageReceived(
FrameHostMsg_ToggleFullscreen(orig_rfh->GetRoutingID(), true));
- EXPECT_TRUE(orig_rvh->IsFullscreen());
+ EXPECT_TRUE(orig_rvh->IsFullscreenGranted());
EXPECT_TRUE(contents()->IsFullscreenForCurrentTab());
EXPECT_TRUE(fake_delegate.IsFullscreenForTabOrPending(contents()));
@@ -1371,7 +1371,7 @@ TEST_F(WebContentsImplTest, HistoryNavigationExitsFullscreen) {
orig_rfh, i + 1, url, ui::PAGE_TRANSITION_FORWARD_BACK);
// Confirm fullscreen has exited.
- EXPECT_FALSE(orig_rvh->IsFullscreen());
+ EXPECT_FALSE(orig_rvh->IsFullscreenGranted());
EXPECT_FALSE(contents()->IsFullscreenForCurrentTab());
EXPECT_FALSE(fake_delegate.IsFullscreenForTabOrPending(contents()));
}
@@ -1409,12 +1409,12 @@ TEST_F(WebContentsImplTest, CrashExitsFullscreen) {
contents()->GetMainFrame(), 1, url, ui::PAGE_TRANSITION_TYPED);
// Toggle fullscreen mode on (as if initiated via IPC from renderer).
- EXPECT_FALSE(test_rvh()->IsFullscreen());
+ EXPECT_FALSE(test_rvh()->IsFullscreenGranted());
EXPECT_FALSE(contents()->IsFullscreenForCurrentTab());
EXPECT_FALSE(fake_delegate.IsFullscreenForTabOrPending(contents()));
contents()->GetMainFrame()->OnMessageReceived(FrameHostMsg_ToggleFullscreen(
contents()->GetMainFrame()->GetRoutingID(), true));
- EXPECT_TRUE(test_rvh()->IsFullscreen());
+ EXPECT_TRUE(test_rvh()->IsFullscreenGranted());
EXPECT_TRUE(contents()->IsFullscreenForCurrentTab());
EXPECT_TRUE(fake_delegate.IsFullscreenForTabOrPending(contents()));
@@ -1424,7 +1424,7 @@ TEST_F(WebContentsImplTest, CrashExitsFullscreen) {
0, base::TERMINATION_STATUS_PROCESS_CRASHED, -1));
// Confirm fullscreen has exited.
- EXPECT_FALSE(test_rvh()->IsFullscreen());
+ EXPECT_FALSE(test_rvh()->IsFullscreenGranted());
EXPECT_FALSE(contents()->IsFullscreenForCurrentTab());
EXPECT_FALSE(fake_delegate.IsFullscreenForTabOrPending(contents()));
diff --git a/content/common/view_messages.h b/content/common/view_messages.h
index b8acc3a..8513435 100644
--- a/content/common/view_messages.h
+++ b/content/common/view_messages.h
@@ -470,8 +470,8 @@ IPC_STRUCT_BEGIN(ViewMsg_Resize_Params)
IPC_STRUCT_MEMBER(gfx::Size, visible_viewport_size)
// The resizer rect.
IPC_STRUCT_MEMBER(gfx::Rect, resizer_rect)
- // Indicates whether a page is fullscreen or not.
- IPC_STRUCT_MEMBER(bool, is_fullscreen)
+ // Indicates whether tab-initiated fullscreen was granted.
+ IPC_STRUCT_MEMBER(bool, is_fullscreen_granted)
// If set, requests the renderer to reply with a ViewHostMsg_UpdateRect
// with the ViewHostMsg_UpdateRect_Flags::IS_RESIZE_ACK bit set in flags.
IPC_STRUCT_MEMBER(bool, needs_resize_ack)
diff --git a/content/public/test/render_view_test.cc b/content/public/test/render_view_test.cc
index 935b219..1513b8d 100644
--- a/content/public/test/render_view_test.cc
+++ b/content/public/test/render_view_test.cc
@@ -380,7 +380,7 @@ uint32 RenderViewTest::GetNavigationIPCType() {
void RenderViewTest::Resize(gfx::Size new_size,
gfx::Rect resizer_rect,
- bool is_fullscreen) {
+ bool is_fullscreen_granted) {
ViewMsg_Resize_Params params;
params.screen_info = blink::WebScreenInfo();
params.new_size = new_size;
@@ -388,7 +388,7 @@ void RenderViewTest::Resize(gfx::Size new_size,
params.top_controls_height = 0.f;
params.top_controls_shrink_blink_size = false;
params.resizer_rect = resizer_rect;
- params.is_fullscreen = is_fullscreen;
+ params.is_fullscreen_granted = is_fullscreen_granted;
scoped_ptr<IPC::Message> resize_message(new ViewMsg_Resize(0, params));
OnMessageReceived(*resize_message);
}
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc
index 2d94098..d9f9d58 100644
--- a/content/renderer/pepper/pepper_plugin_instance_impl.cc
+++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc
@@ -1263,7 +1263,7 @@ void PepperPluginInstanceImpl::ViewChanged(
WebDocument document = element.document();
bool is_fullscreen_element = (element == document.fullScreenElement());
if (!view_data_.is_fullscreen && desired_fullscreen_state_ &&
- render_frame()->GetRenderWidget()->is_fullscreen() &&
+ render_frame()->GetRenderWidget()->is_fullscreen_granted() &&
is_fullscreen_element) {
// Entered fullscreen. Only possible via SetFullscreen().
view_data_.is_fullscreen = true;
diff --git a/content/renderer/render_frame_impl_browsertest.cc b/content/renderer/render_frame_impl_browsertest.cc
index 7aeb278..633c18a 100644
--- a/content/renderer/render_frame_impl_browsertest.cc
+++ b/content/renderer/render_frame_impl_browsertest.cc
@@ -125,7 +125,7 @@ TEST_F(RenderFrameImplTest, MAYBE_FrameResize) {
resize_params.top_controls_height = 0.f;
resize_params.top_controls_shrink_blink_size = false;
resize_params.resizer_rect = gfx::Rect();
- resize_params.is_fullscreen = false;
+ resize_params.is_fullscreen_granted = false;
scoped_ptr<IPC::Message> resize_message(new ViewMsg_Resize(0, resize_params));
FrameWidget()->OnMessageReceived(*resize_message);
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 1f99730b..9a4a22c 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -2687,7 +2687,7 @@ void RenderViewImpl::OnDisableAutoResize(const gfx::Size& new_size) {
top_controls_height_,
visible_viewport_size_,
resizer_rect_,
- is_fullscreen_,
+ is_fullscreen_granted_,
NO_RESIZE_ACK);
}
}
@@ -3695,7 +3695,7 @@ void RenderViewImpl::SetDeviceScaleFactorForTesting(float factor) {
params.top_controls_shrink_blink_size = false;
params.top_controls_height = 0.f;
params.resizer_rect = WebRect();
- params.is_fullscreen = is_fullscreen();
+ params.is_fullscreen_granted = is_fullscreen_granted();
OnResize(params);
}
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index d479295..1b6be53 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -269,7 +269,7 @@ class RenderWidget::ScreenMetricsEmulator {
void Apply(bool top_controls_shrink_blink_size,
float top_controls_height,
gfx::Rect resizer_rect,
- bool is_fullscreen);
+ bool is_fullscreen_granted);
RenderWidget* widget_;
@@ -307,7 +307,7 @@ RenderWidget::ScreenMetricsEmulator::ScreenMetricsEmulator(
Apply(widget_->top_controls_shrink_blink_size_,
widget_->top_controls_height_,
widget_->resizer_rect_,
- widget_->is_fullscreen_);
+ widget_->is_fullscreen_granted_);
}
RenderWidget::ScreenMetricsEmulator::~ScreenMetricsEmulator() {
@@ -323,7 +323,7 @@ RenderWidget::ScreenMetricsEmulator::~ScreenMetricsEmulator() {
widget_->top_controls_height_,
original_visible_viewport_size_,
widget_->resizer_rect_,
- widget_->is_fullscreen_,
+ widget_->is_fullscreen_granted_,
NO_RESIZE_ACK);
}
@@ -337,14 +337,14 @@ void RenderWidget::ScreenMetricsEmulator::Reapply() {
Apply(widget_->top_controls_shrink_blink_size_,
widget_->top_controls_height_,
widget_->resizer_rect_,
- widget_->is_fullscreen_);
+ widget_->is_fullscreen_granted_);
}
void RenderWidget::ScreenMetricsEmulator::Apply(
bool top_controls_shrink_blink_size,
float top_controls_height,
gfx::Rect resizer_rect,
- bool is_fullscreen) {
+ bool is_fullscreen_granted) {
applied_widget_rect_.set_size(gfx::Size(params_.viewSize));
if (!applied_widget_rect_.width())
applied_widget_rect_.set_width(original_size_.width());
@@ -409,7 +409,7 @@ void RenderWidget::ScreenMetricsEmulator::Apply(
top_controls_height,
applied_widget_rect_.size(),
resizer_rect,
- is_fullscreen,
+ is_fullscreen_granted,
NO_RESIZE_ACK);
}
@@ -424,7 +424,7 @@ void RenderWidget::ScreenMetricsEmulator::OnResizeMessage(
Apply(params.top_controls_shrink_blink_size,
params.top_controls_height,
params.resizer_rect,
- params.is_fullscreen);
+ params.is_fullscreen_granted);
if (need_ack) {
widget_->set_next_paint_is_resize_ack();
@@ -479,7 +479,7 @@ RenderWidget::RenderWidget(blink::WebPopupType popup_type,
did_show_(false),
is_hidden_(hidden),
never_visible_(never_visible),
- is_fullscreen_(false),
+ is_fullscreen_granted_(false),
has_focus_(false),
handling_input_event_(false),
handling_ime_event_(false),
@@ -771,7 +771,7 @@ void RenderWidget::Resize(const gfx::Size& new_size,
float top_controls_height,
const gfx::Size& visible_viewport_size,
const gfx::Rect& resizer_rect,
- bool is_fullscreen,
+ bool is_fullscreen_granted,
const ResizeAck resize_ack) {
if (resizing_mode_selector_->NeverUsesSynchronousResize()) {
// A resize ack shouldn't be requested if we have not ACK'd the previous
@@ -795,10 +795,10 @@ void RenderWidget::Resize(const gfx::Size& new_size,
resizer_rect_ = resizer_rect;
// NOTE: We may have entered fullscreen mode without changing our size.
- bool fullscreen_change = is_fullscreen_ != is_fullscreen;
+ bool fullscreen_change = is_fullscreen_granted_ != is_fullscreen_granted;
if (fullscreen_change)
WillToggleFullscreen();
- is_fullscreen_ = is_fullscreen;
+ is_fullscreen_granted_ = is_fullscreen_granted;
webwidget_->setTopControlsHeight(top_controls_height,
top_controls_shrink_blink_size_);
@@ -843,7 +843,7 @@ void RenderWidget::SetWindowRectSynchronously(
top_controls_height_,
new_window_rect.size(),
gfx::Rect(),
- is_fullscreen_,
+ is_fullscreen_granted_,
NO_RESIZE_ACK);
view_screen_rect_ = new_window_rect;
window_screen_rect_ = new_window_rect;
@@ -903,7 +903,7 @@ void RenderWidget::OnResize(const ViewMsg_Resize_Params& params) {
params.top_controls_height,
params.visible_viewport_size,
params.resizer_rect,
- params.is_fullscreen,
+ params.is_fullscreen_granted,
params.needs_resize_ack ? SEND_RESIZE_ACK : NO_RESIZE_ACK);
if (orientation_changed)
@@ -1841,7 +1841,7 @@ void RenderWidget::WillToggleFullscreen() {
if (!webwidget_)
return;
- if (is_fullscreen_) {
+ if (is_fullscreen_granted_) {
webwidget_->willExitFullScreen();
} else {
webwidget_->willEnterFullScreen();
@@ -1852,7 +1852,7 @@ void RenderWidget::DidToggleFullscreen() {
if (!webwidget_)
return;
- if (is_fullscreen_) {
+ if (is_fullscreen_granted_) {
webwidget_->didEnterFullScreen();
} else {
webwidget_->didExitFullScreen();
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
index 072da8c..6802d64 100644
--- a/content/renderer/render_widget.h
+++ b/content/renderer/render_widget.h
@@ -123,7 +123,7 @@ class CONTENT_EXPORT RenderWidget
blink::WebWidget* webwidget() const { return webwidget_; }
gfx::Size size() const { return size_; }
bool has_focus() const { return has_focus_; }
- bool is_fullscreen() const { return is_fullscreen_; }
+ bool is_fullscreen_granted() const { return is_fullscreen_granted_; }
bool is_hidden() const { return is_hidden_; }
bool handling_input_event() const { return handling_input_event_; }
// Temporary for debugging purposes...
@@ -389,7 +389,7 @@ class CONTENT_EXPORT RenderWidget
float top_controls_height,
const gfx::Size& visible_viewport_size,
const gfx::Rect& resizer_rect,
- bool is_fullscreen,
+ bool is_fullscreen_granted,
ResizeAck resize_ack);
// Used to force the size of a window when running layout tests.
void SetWindowRectSynchronously(const gfx::Rect& new_window_rect);
@@ -659,8 +659,8 @@ class CONTENT_EXPORT RenderWidget
// Indicates that we are never visible, so never produce graphical output.
bool never_visible_;
- // Indicates that we are in fullscreen mode.
- bool is_fullscreen_;
+ // Indicates whether tab-initiated fullscreen was granted.
+ bool is_fullscreen_granted_;
// Indicates whether we have been focused/unfocused by the browser.
bool has_focus_;
diff --git a/content/renderer/render_widget_browsertest.cc b/content/renderer/render_widget_browsertest.cc
index b0ed636..ab31427 100644
--- a/content/renderer/render_widget_browsertest.cc
+++ b/content/renderer/render_widget_browsertest.cc
@@ -18,7 +18,7 @@ TEST_F(RenderWidgetTest, OnResize) {
resize_params.top_controls_height = 0.f;
resize_params.top_controls_shrink_blink_size = false;
resize_params.resizer_rect = gfx::Rect();
- resize_params.is_fullscreen = false;
+ resize_params.is_fullscreen_granted = false;
resize_params.needs_resize_ack = false;
OnResize(resize_params);
EXPECT_EQ(resize_params.needs_resize_ack, next_paint_is_resize_ack());
diff --git a/content/renderer/resizing_mode_selector.cc b/content/renderer/resizing_mode_selector.cc
index d51b457..08a1cf4 100644
--- a/content/renderer/resizing_mode_selector.cc
+++ b/content/renderer/resizing_mode_selector.cc
@@ -22,7 +22,7 @@ bool ResizingModeSelector::ShouldAbortOnResize(
RenderWidget* widget,
const ViewMsg_Resize_Params& params) {
return is_synchronous_mode_ &&
- params.is_fullscreen == widget->is_fullscreen() &&
+ params.is_fullscreen_granted == widget->is_fullscreen_granted() &&
params.screen_info.deviceScaleFactor ==
widget->screenInfo().deviceScaleFactor;
}
diff --git a/content/test/test_render_view_host.cc b/content/test/test_render_view_host.cc
index 5380c93..2ffee6c 100644
--- a/content/test/test_render_view_host.cc
+++ b/content/test/test_render_view_host.cc
@@ -249,8 +249,8 @@ bool TestRenderViewHost::IsRenderViewLive() const {
return render_view_created_;
}
-bool TestRenderViewHost::IsFullscreen() const {
- return RenderViewHostImpl::IsFullscreen();
+bool TestRenderViewHost::IsFullscreenGranted() const {
+ return RenderViewHostImpl::IsFullscreenGranted();
}
void TestRenderViewHost::SimulateWasHidden() {
diff --git a/content/test/test_render_view_host.h b/content/test/test_render_view_host.h
index c7a75a3..9ef744f 100644
--- a/content/test/test_render_view_host.h
+++ b/content/test/test_render_view_host.h
@@ -241,7 +241,7 @@ class TestRenderViewHost
int32 max_page_id,
bool window_was_created_with_opener) override;
bool IsRenderViewLive() const override;
- bool IsFullscreen() const override;
+ bool IsFullscreenGranted() const override;
private:
FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, FilterNavigate);