diff --git a/atom.gyp b/atom.gyp
index 0f69b18f41e5..12d1bb1eb142 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -29,6 +29,7 @@
       'atom/browser/api/lib/tray.coffee',
       'atom/browser/api/lib/web-contents.coffee',
       'atom/browser/lib/chrome-extension.coffee',
+      'atom/browser/lib/guest-view-manager.coffee',
       'atom/browser/lib/init.coffee',
       'atom/browser/lib/objects-registry.coffee',
       'atom/browser/lib/rpc-server.coffee',
@@ -41,6 +42,7 @@
       'atom/common/lib/init.coffee',
       'atom/common/lib/asar.coffee',
       'atom/renderer/lib/chrome-api.coffee',
+      'atom/renderer/lib/guest-view-internal.coffee',
       'atom/renderer/lib/init.coffee',
       'atom/renderer/lib/inspector.coffee',
       'atom/renderer/lib/override.coffee',
diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc
index 9978e92d6cf3..62f4bacd2f6e 100644
--- a/atom/browser/api/atom_api_web_contents.cc
+++ b/atom/browser/api/atom_api_web_contents.cc
@@ -30,10 +30,14 @@ v8::Persistent<v8::ObjectTemplate> template_;
 }  // namespace
 
 WebContents::WebContents(content::WebContents* web_contents)
-    : content::WebContentsObserver(web_contents) {
+    : content::WebContentsObserver(web_contents),
+      guest_instance_id_(-1) {
 }
 
-WebContents::WebContents(const mate::Dictionary& options) {
+WebContents::WebContents(const mate::Dictionary& options)
+    : guest_instance_id_(-1) {
+  options.Get("guestInstances", &guest_instance_id_);
+
   content::WebContents::CreateParams params(AtomBrowserContext::Get());
   bool is_guest;
   if (options.Get("isGuest", &is_guest) && is_guest)
@@ -44,6 +48,7 @@ WebContents::WebContents(const mate::Dictionary& options) {
 }
 
 WebContents::~WebContents() {
+  Destroy();
 }
 
 void WebContents::RenderViewDeleted(content::RenderViewHost* render_view_host) {
@@ -95,8 +100,47 @@ void WebContents::WebContentsDestroyed() {
   Emit("destroyed");
 }
 
+void WebContents::WillAttach(content::WebContents* embedder_web_contents,
+                             const base::DictionaryValue& extra_params) {
+  LOG(ERROR) << "WillAttach";
+}
+
+void WebContents::DidAttach() {
+  LOG(ERROR) << "DidAttach";
+}
+
+int WebContents::GetGuestInstanceID() const {
+  return guest_instance_id_;
+}
+
+void WebContents::ElementSizeChanged(const gfx::Size& old_size,
+                                     const gfx::Size& new_size) {
+  LOG(ERROR) << "ElementSizeChanged";
+}
+
+void WebContents::GuestSizeChanged(const gfx::Size& old_size,
+                                   const gfx::Size& new_size) {
+  LOG(ERROR) << "GuestSizeChanged";
+}
+
+void WebContents::RequestPointerLockPermission(
+    bool user_gesture,
+    bool last_unlocked_by_target,
+    const base::Callback<void(bool)>& callback) {
+  callback.Run(true);
+}
+
+void WebContents::RegisterDestructionCallback(
+    const DestructionCallback& callback) {
+  LOG(ERROR) << "RegisterDestructionCallback";
+  destruction_callback_ = callback;
+}
+
 void WebContents::Destroy() {
   if (storage_) {
+    if (!destruction_callback_.is_null())
+      destruction_callback_.Run();
+
     Observe(nullptr);
     storage_.reset();
   }
diff --git a/atom/browser/api/atom_api_web_contents.h b/atom/browser/api/atom_api_web_contents.h
index 4e119768960c..7734fee18a89 100644
--- a/atom/browser/api/atom_api_web_contents.h
+++ b/atom/browser/api/atom_api_web_contents.h
@@ -59,11 +59,11 @@ class WebContents : public mate::EventEmitter,
   explicit WebContents(const mate::Dictionary& options);
   ~WebContents();
 
-  // mate::Wrappable implementations:
+  // mate::Wrappable:
   virtual mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
       v8::Isolate* isolate) OVERRIDE;
 
-  // content::WebContentsObserver implementations:
+  // content::WebContentsObserver:
   virtual void RenderViewDeleted(content::RenderViewHost*) OVERRIDE;
   virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;
   virtual void DidFinishLoad(content::RenderFrameHost* render_frame_host,
@@ -75,6 +75,22 @@ class WebContents : public mate::EventEmitter,
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void WebContentsDestroyed() OVERRIDE;
 
+  // content::BrowserPluginGuestDelegate:
+  virtual void WillAttach(content::WebContents* embedder_web_contents,
+                          const base::DictionaryValue& extra_params) final;
+  virtual void DidAttach() final;
+  virtual int GetGuestInstanceID() const final;
+  virtual void ElementSizeChanged(const gfx::Size& old_size,
+                                  const gfx::Size& new_size) final;
+  virtual void GuestSizeChanged(const gfx::Size& old_size,
+                                const gfx::Size& new_size) final;
+  virtual void RequestPointerLockPermission(
+      bool user_gesture,
+      bool last_unlocked_by_target,
+      const base::Callback<void(bool)>& callback) final;
+  virtual void RegisterDestructionCallback(
+      const DestructionCallback& callback) final;
+
  private:
   // Called when received a message from renderer.
   void OnRendererMessage(const base::string16& channel,
@@ -85,6 +101,11 @@ class WebContents : public mate::EventEmitter,
                              const base::ListValue& args,
                              IPC::Message* message);
 
+  // Unique ID for a guest WebContents.
+  int guest_instance_id_;
+
+  DestructionCallback destruction_callback_;
+
   // Stores the WebContents that managed by this class.
   scoped_ptr<content::WebContents> storage_;
 
diff --git a/atom/browser/default_app/index.html b/atom/browser/default_app/index.html
index 810f11f18476..0d9c59a857fe 100644
--- a/atom/browser/default_app/index.html
+++ b/atom/browser/default_app/index.html
@@ -56,7 +56,7 @@
   </style>
 </head>
 <body>
-  <browser-plugin type="application/browser-plugin"></browser-plugin>
+  <webview id="foo" src="http://www.baidu.com/" style="display:block; width:640px; height:100px"></webview>
 
   <script>
     var execPath = require('remote').process.execPath;
diff --git a/atom/browser/lib/guest-view-manager.coffee b/atom/browser/lib/guest-view-manager.coffee
new file mode 100644
index 000000000000..b462f11042cc
--- /dev/null
+++ b/atom/browser/lib/guest-view-manager.coffee
@@ -0,0 +1,26 @@
+ipc = require 'ipc'
+webContents = require 'web-contents'
+
+nextInstanceId = 0
+guestInstances = {}
+
+# Generate guestInstanceId.
+getNextInstanceId = (webContents) ->
+  ++nextInstanceId
+
+# Create a new guest instance.
+createGuest = (embedder, params) ->
+  id = getNextInstanceId embedder
+  guestInstances[id] = webContents.create isGuest: true, guestInstanceId: id
+  id
+
+# Destroy an existing guest instance.
+destroyGuest = (id) ->
+  guestInstances[id].destroy()
+  delete guestInstances[id]
+
+ipc.on 'ATOM_SHELL_GUEST_VIEW_MANAGER_CREATE_GUEST', (event, type, params, requestId) ->
+  event.sender.send "ATOM_SHELL_RESPONSE_#{requestId}", createGuest(event.sender)
+
+ipc.on 'ATOM_SHELL_GUEST_VIEW_MANAGER_DESTROY_GUEST', (event, guestInstanceId) ->
+  destroyGuest guestInstanceId
diff --git a/atom/browser/lib/init.coffee b/atom/browser/lib/init.coffee
index 7bf9e4e13906..59f2c5d1f2fc 100644
--- a/atom/browser/lib/init.coffee
+++ b/atom/browser/lib/init.coffee
@@ -61,6 +61,9 @@ setImmediate ->
   # Load the RPC server.
   require './rpc-server.js'
 
+  # Load the guest view manager.
+  require './guest-view-manager.js'
+
   # Now we try to load app's package.json.
   packageJson = null
 
diff --git a/atom/renderer/lib/guest-view-internal.coffee b/atom/renderer/lib/guest-view-internal.coffee
new file mode 100644
index 000000000000..cdd7526ebf77
--- /dev/null
+++ b/atom/renderer/lib/guest-view-internal.coffee
@@ -0,0 +1,12 @@
+ipc = require 'ipc'
+
+requestId = 0
+
+module.exports =
+  createGuest: (type, params, callback) ->
+    requestId++
+    ipc.send 'ATOM_SHELL_GUEST_VIEW_MANAGER_CREATE_GUEST', type, params, requestId
+    ipc.on "ATOM_SHELL_RESPONSE_#{requestId}", callback
+
+  destroyGuest: (guestInstanceId) ->
+    ipc.send 'ATOM_SHELL_GUEST_VIEW_MANAGER_DESTROY_GUEST', guestInstanceId
diff --git a/atom/renderer/lib/webview.coffee b/atom/renderer/lib/webview.coffee
index 2f14bb9adac2..f1dbd3b0f43a 100644
--- a/atom/renderer/lib/webview.coffee
+++ b/atom/renderer/lib/webview.coffee
@@ -1,4 +1,5 @@
 v8Util = process.atomBinding 'v8_util'
+guestViewInternal = require './guest-view-internal'
 webView = require 'web-view'
 
 # ID generator.
@@ -114,8 +115,7 @@ class WebView
     # heard back from createGuest yet. We will not reset the flag in this case so
     # that we don't end up allocating a second guest.
     if @guestInstanceId
-      # FIXME
-      # GuestViewInternal.destroyGuest @guestInstanceId
+      guestViewInternal.destroyGuest @guestInstanceId
       @guestInstanceId = undefined
       @beforeFirstNavigation = true
       @validPartitionId = true
@@ -287,6 +287,7 @@ class WebView
       @browserPluginNode.removeAttribute 'internalinstanceid'
       @internalInstanceId = parseInt newValue
 
+      console.log 'internalinstanceid', @internalInstanceId
       if !!@guestInstanceId and @guestInstanceId != 0
         isNewWindow = if @deferredAttachState then @deferredAttachState.isNewWindow else false
         params = @buildAttachParams isNewWindow
@@ -378,18 +379,17 @@ class WebView
     @parseSrcAttribute result
 
   createGuest: ->
-    return if @pendingGuestCreation?
+    return if @pendingGuestCreation
     storagePartitionId =
       @webviewNode.getAttribute(WEB_VIEW_ATTRIBUTE_PARTITION) or
       @webviewNode[WEB_VIEW_ATTRIBUTE_PARTITION]
     params = storagePartitionId: storagePartitionId
-    # FIXME
-    # GuestViewInternal.createGuest 'webview', params, (guestInstanceId) =>
-    #   @pendingGuestCreation = false
-    #   unless @elementAttached
-    #     GuestViewInternal.destroyGuest guestInstanceId
-    #     return
-    #   @attachWindow guestInstanceId, false
+    guestViewInternal.createGuest 'webview', params, (guestInstanceId) =>
+      @pendingGuestCreation = false
+      unless @elementAttached
+        guestViewInternal.destroyGuest guestInstanceId
+        return
+      @attachWindow guestInstanceId, false
     @pendingGuestCreation = true
 
   onFrameNameChanged: (name) ->
@@ -452,7 +452,7 @@ class WebView
     params = @buildAttachParams isNewWindow
 
     unless @isPluginInRenderTree()
-      @deferredAttachState =  isNewWindow: isNewWindow
+      @deferredAttachState = isNewWindow: isNewWindow
       return true
 
     @deferredAttachState = null