From a9072049ea34f933057a445c6d0da57b356fe406 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 8 Dec 2014 06:08:21 -0800
Subject: [PATCH] Move webview code to atom/renderer/lib/web-view

---
 atom.gyp                                                    | 4 ++--
 atom/renderer/lib/init.coffee                               | 2 +-
 atom/renderer/lib/{ => web-view}/guest-view-internal.coffee | 0
 atom/renderer/lib/{ => web-view}/web-view.coffee            | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename atom/renderer/lib/{ => web-view}/guest-view-internal.coffee (100%)
 rename atom/renderer/lib/{ => web-view}/web-view.coffee (100%)

diff --git a/atom.gyp b/atom.gyp
index 3c368b1b9e5..357763e3578 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -44,11 +44,11 @@
       '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',
-      'atom/renderer/lib/web-view.coffee',
+      'atom/renderer/lib/web-view/guest-view-internal.coffee',
+      'atom/renderer/lib/web-view/web-view.coffee',
       'atom/renderer/api/lib/ipc.coffee',
       'atom/renderer/api/lib/remote.coffee',
       'atom/renderer/api/lib/web-frame.coffee',
diff --git a/atom/renderer/lib/init.coffee b/atom/renderer/lib/init.coffee
index ebf69ac3a65..13b928573bb 100644
--- a/atom/renderer/lib/init.coffee
+++ b/atom/renderer/lib/init.coffee
@@ -46,7 +46,7 @@ else
   # Override default web functions.
   require path.join(__dirname, 'override')
   # Load webview tag implementation.
-  require path.join(__dirname, 'web-view') unless process.guestInstanceId?
+  require path.join(__dirname, 'web-view/web-view') unless process.guestInstanceId?
 
 if nodeIntegration in ['true', 'all', 'except-iframe', 'manual-enable-iframe']
   # Export node bindings to global.
diff --git a/atom/renderer/lib/guest-view-internal.coffee b/atom/renderer/lib/web-view/guest-view-internal.coffee
similarity index 100%
rename from atom/renderer/lib/guest-view-internal.coffee
rename to atom/renderer/lib/web-view/guest-view-internal.coffee
diff --git a/atom/renderer/lib/web-view.coffee b/atom/renderer/lib/web-view/web-view.coffee
similarity index 100%
rename from atom/renderer/lib/web-view.coffee
rename to atom/renderer/lib/web-view/web-view.coffee