Commit 1abacfa0 authored by Patrick Monette's avatar Patrick Monette Committed by Commit Bot

Remove reference to a closed bug in RenderViewHostImpl

Also remove unneeded null checks since the |delegate_| is never null.

Bug: 82827
Change-Id: Ic9ca6af8208330ae6ab85d2de1c0a61921f68ad8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1935236Reviewed-by: default avatarKen Buchanan <kenrb@chromium.org>
Commit-Queue: Patrick Monette <pmonette@chromium.org>
Cr-Commit-Position: refs/heads/master@{#719357}
parent aafe73eb
...@@ -228,7 +228,7 @@ RenderViewHostImpl::RenderViewHostImpl( ...@@ -228,7 +228,7 @@ RenderViewHostImpl::RenderViewHostImpl(
routing_id_(routing_id), routing_id_(routing_id),
main_frame_routing_id_(main_frame_routing_id) { main_frame_routing_id_(main_frame_routing_id) {
DCHECK(instance_.get()); DCHECK(instance_.get());
CHECK(delegate_); // http://crbug.com/82827 DCHECK(delegate_);
DCHECK_NE(GetRoutingID(), render_widget_host_->GetRoutingID()); DCHECK_NE(GetRoutingID(), render_widget_host_->GetRoutingID());
std::pair<RoutingIDViewMap::iterator, bool> result = std::pair<RoutingIDViewMap::iterator, bool> result =
...@@ -544,7 +544,7 @@ const WebPreferences RenderViewHostImpl::ComputeWebPreferences() { ...@@ -544,7 +544,7 @@ const WebPreferences RenderViewHostImpl::ComputeWebPreferences() {
prefs.viewport_enabled = command_line.HasSwitch(switches::kEnableViewport); prefs.viewport_enabled = command_line.HasSwitch(switches::kEnableViewport);
if (delegate_ && delegate_->IsOverridingUserAgent()) if (delegate_->IsOverridingUserAgent())
prefs.viewport_meta_enabled = false; prefs.viewport_meta_enabled = false;
prefs.main_frame_resizes_are_orientation_changes = prefs.main_frame_resizes_are_orientation_changes =
...@@ -553,7 +553,7 @@ const WebPreferences RenderViewHostImpl::ComputeWebPreferences() { ...@@ -553,7 +553,7 @@ const WebPreferences RenderViewHostImpl::ComputeWebPreferences() {
prefs.spatial_navigation_enabled = command_line.HasSwitch( prefs.spatial_navigation_enabled = command_line.HasSwitch(
switches::kEnableSpatialNavigation); switches::kEnableSpatialNavigation);
if (delegate_ && delegate_->IsSpatialNavigationDisabled()) if (delegate_->IsSpatialNavigationDisabled())
prefs.spatial_navigation_enabled = false; prefs.spatial_navigation_enabled = false;
prefs.caret_browsing_enabled = prefs.caret_browsing_enabled =
...@@ -583,11 +583,11 @@ const WebPreferences RenderViewHostImpl::ComputeWebPreferences() { ...@@ -583,11 +583,11 @@ const WebPreferences RenderViewHostImpl::ComputeWebPreferences() {
prefs.user_gesture_required_for_presentation = !command_line.HasSwitch( prefs.user_gesture_required_for_presentation = !command_line.HasSwitch(
switches::kDisableGestureRequirementForPresentation); switches::kDisableGestureRequirementForPresentation);
if (delegate_ && delegate_->HideDownloadUI()) if (delegate_->HideDownloadUI())
prefs.hide_download_ui = true; prefs.hide_download_ui = true;
// `media_controls_enabled` is `true` by default. // `media_controls_enabled` is `true` by default.
if (delegate_ && delegate_->HasPersistentVideo()) if (delegate_->HasPersistentVideo())
prefs.media_controls_enabled = false; prefs.media_controls_enabled = false;
GetContentClient()->browser()->OverrideWebkitPrefs(this, &prefs); GetContentClient()->browser()->OverrideWebkitPrefs(this, &prefs);
......
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