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

Unified Diff: content/public/browser/render_view_host.h

Issue 226213002: Removes use_mojo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge 2 trunk Created 6 years, 9 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
« no previous file with comments | « content/content_tests.gypi ('k') | content/public/browser/web_ui_data_source.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/browser/render_view_host.h
diff --git a/content/public/browser/render_view_host.h b/content/public/browser/render_view_host.h
index 09104c5d2fde409f65920e90dfd5182a52304165..74a2909b08d82d13c0daa2d877a6de45c60ebba0 100644
--- a/content/public/browser/render_view_host.h
+++ b/content/public/browser/render_view_host.h
@@ -12,11 +12,8 @@
#include "content/public/browser/render_widget_host.h"
#include "content/public/common/file_chooser_params.h"
#include "content/public/common/page_zoom.h"
-#include "third_party/WebKit/public/web/WebDragOperation.h"
-
-#if defined(USE_MOJO)
#include "mojo/public/cpp/system/core.h"
-#endif
+#include "third_party/WebKit/public/web/WebDragOperation.h"
class GURL;
struct WebPreferences;
@@ -218,6 +215,9 @@ class CONTENT_EXPORT RenderViewHost : virtual public RenderWidgetHost {
virtual void GetAudioOutputControllers(
const GetAudioOutputControllersCallback& callback) const = 0;
+ // Sets the mojo handle for WebUI pages.
+ virtual void SetWebUIHandle(mojo::ScopedMessagePipeHandle handle) = 0;
+
#if defined(OS_ANDROID)
// Selects and zooms to the find result nearest to the point (x,y)
// defined in find-in-page coordinates.
@@ -230,11 +230,6 @@ class CONTENT_EXPORT RenderViewHost : virtual public RenderWidgetHost {
virtual void DisableFullscreenEncryptedMediaPlayback() = 0;
#endif
-#if defined(USE_MOJO)
- // Sets the mojo handle for WebUI pages.
- virtual void SetWebUIHandle(mojo::ScopedMessagePipeHandle handle) = 0;
-#endif
-
private:
// This interface should only be implemented inside content.
friend class RenderViewHostImpl;
« no previous file with comments | « content/content_tests.gypi ('k') | content/public/browser/web_ui_data_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698