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

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

Issue 1461243002: [OLD ATTEMPT, DO NOT REVIEW] mustash: Enable connections to mus from the Chrome renderer Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed Ben's comments Created 5 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
Index: content/public/browser/web_contents.h
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
index c9fa8a011e04fed5db3aad0bb80354a194b29158..2025b9191f3043514af75334e524763f05996904 100644
--- a/content/public/browser/web_contents.h
+++ b/content/public/browser/web_contents.h
@@ -39,6 +39,10 @@ namespace blink {
struct WebFindOptions;
}
+namespace mus {
+class Window;
+}
+
namespace net {
struct LoadStateWithParam;
}
@@ -135,6 +139,11 @@ class WebContents : public PageNavigator,
// If non-null then this WebContents will be hosted by a BrowserPlugin.
BrowserPluginGuestDelegate* guest_delegate;
+#if defined(MOJO_SHELL_CLIENT)
+ // If non-null then this WebContents will be hosted by a mus::Window.
+ mus::Window* mus_window;
Ben Goodger (Google) 2015/11/24 15:30:05 this ifdef is going to cause you pain in targets n
Fady Samuel 2015/11/24 17:06:36 Done.
+#endif
+
// Used to specify the location context which display the new view should
// belong. This can be nullptr if not needed.
gfx::NativeView context;

Powered by Google App Engine
This is Rietveld 408576698