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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2480203002: ui: Cleanup class/struct forward declarations (Closed)
Patch Set: Sync CL to position 430550 Created 4 years, 1 month 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/renderer/mus/compositor_mus_connection_unittest.cc ('k') | content/renderer/render_thread_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 1115f80527d5811b2a518473947ab65682847fd5..069f57dfcf379965038604939fe59511559b28f6 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -108,6 +108,7 @@
#include "content/renderer/internal_document_state_data.h"
#include "content/renderer/manifest/manifest_manager.h"
#include "content/renderer/media/audio_device_factory.h"
+#include "content/renderer/media/media_devices_listener_impl.h"
#include "content/renderer/media/media_permission_dispatcher.h"
#include "content/renderer/media/media_stream_dispatcher.h"
#include "content/renderer/media/media_stream_renderer_factory_impl.h"
@@ -5049,6 +5050,13 @@ void RenderFrameImpl::OnFailedNavigation(
return;
}
+ // On load failure, a frame can ask its owner to render fallback content.
+ // When that happens, don't load an error page.
+ if (frame_->maybeRenderFallbackContent(error)) {
+ browser_side_navigation_pending_ = false;
+ return;
+ }
+
// Make sure errors are not shown in view source mode.
frame_->enableViewSourceMode(false);
@@ -5964,6 +5972,8 @@ void RenderFrameImpl::InitializeUserMediaClient() {
web_user_media_client_ = new UserMediaClientImpl(
this, RenderThreadImpl::current()->GetPeerConnectionDependencyFactory(),
base::MakeUnique<MediaStreamDispatcher>(this));
+ GetInterfaceRegistry()->AddInterface(
+ base::Bind(&MediaDevicesListenerImpl::Create, GetRoutingID()));
#endif
}
« no previous file with comments | « content/renderer/mus/compositor_mus_connection_unittest.cc ('k') | content/renderer/render_thread_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698