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

Unified Diff: content/browser/presentation/presentation_service_impl.h

Issue 1296453004: Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cherry-pick GL_APIENTRY addition back in Created 5 years, 4 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
Index: content/browser/presentation/presentation_service_impl.h
diff --git a/content/browser/presentation/presentation_service_impl.h b/content/browser/presentation/presentation_service_impl.h
index 2e991fa4ded20867b2002798673e7609e18b58c1..0a3fe6fbab3f5787ee3aa291ae20a9dc337d3e25 100644
--- a/content/browser/presentation/presentation_service_impl.h
+++ b/content/browser/presentation/presentation_service_impl.h
@@ -26,6 +26,7 @@
#include "content/public/browser/presentation_service_delegate.h"
#include "content/public/browser/web_contents_observer.h"
#include "content/public/common/frame_navigate_params.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
namespace content {
@@ -48,7 +49,6 @@ using NewSessionMojoCallback = mojo::Callback<
// from the renderer when the first presentation API request is handled.
class CONTENT_EXPORT PresentationServiceImpl
: public NON_EXPORTED_BASE(presentation::PresentationService),
- public mojo::ErrorHandler,
public WebContentsObserver,
public PresentationServiceDelegate::Observer {
public:
@@ -198,10 +198,6 @@ class CONTENT_EXPORT PresentationServiceImpl
// Creates a binding between this object and |request|.
void Bind(mojo::InterfaceRequest<presentation::PresentationService> request);
- // mojo::ErrorHandler override.
- // Note that this is called when the RenderFrameHost is deleted.
- void OnConnectionError() override;
-
// WebContentsObserver override.
void DidNavigateAnyFrame(
content::RenderFrameHost* render_frame_host,
« no previous file with comments | « components/html_viewer/web_socket_handle_impl.cc ('k') | content/browser/presentation/presentation_service_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698