[OLD ATTEMPT, DO NOT REVIEW] mustash: Enable connections to mus from the Chrome renderer

content/public/browser/web_contents.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_
 #define CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_
 
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 21 matching lines @@
 
 namespace base {
 class DictionaryValue;
 class TimeTicks;
 }
 
 namespace blink {
 struct WebFindOptions;
 }
 
+namespace mus {
+class Window;
+}
+
 namespace net {
 struct LoadStateWithParam;
 }
 
 namespace content {
 
 class BrowserContext;
 class BrowserPluginGuestDelegate;
 class InterstitialPage;
 class PageState;
@@ skipping 76 matching lines @@
 
     // Initial size of the new WebContent's view. Can be (0, 0) if not needed.
     gfx::Size initial_size;
 
     // True if the contents should be initially hidden.
     bool initially_hidden;
 
     // 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 not built with
MOJO_SHELL_CLIENT

[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;
 
     // Used to specify that the new WebContents creation is driven by the
     // renderer process. In this case, the renderer-side objects, such as
     // RenderFrame, have already been created on the renderer side, and
     // WebContents construction should take this into account.
     bool renderer_initiated_creation;
   };
@@ skipping 552 matching lines @@
 
  private:
   // This interface should only be implemented inside content.
   friend class WebContentsImpl;
   WebContents() {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_H_