From 331d0481bb438104c1e9c498e697efc06b1ca983 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 4 Feb 2015 15:17:28 -0800
Subject: [PATCH] Move web_view_manager to atom/browser

---
 atom.gyp                                        | 4 ++--
 atom/browser/api/atom_api_web_contents.cc       | 2 +-
 atom/browser/atom_browser_client.cc             | 2 +-
 atom/browser/atom_browser_context.cc            | 2 +-
 atom/browser/{web_view => }/web_view_manager.cc | 2 +-
 atom/browser/{web_view => }/web_view_manager.h  | 6 +++---
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename atom/browser/{web_view => }/web_view_manager.cc (99%)
 rename atom/browser/{web_view => }/web_view_manager.h (95%)

diff --git a/atom.gyp b/atom.gyp
index c0fac768b04..02b12a80a84 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -190,8 +190,8 @@
       'atom/browser/ui/x/window_state_watcher.h',
       'atom/browser/ui/x/x_window_utils.cc',
       'atom/browser/ui/x/x_window_utils.h',
-      'atom/browser/web_view/web_view_manager.cc',
-      'atom/browser/web_view/web_view_manager.h',
+      'atom/browser/web_view_manager.cc',
+      'atom/browser/web_view_manager.h',
       'atom/browser/web_dialog_helper.cc',
       'atom/browser/web_dialog_helper.h',
       'atom/browser/window_list.cc',
diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc
index 9e49691b2ce..637f2aae745 100644
--- a/atom/browser/api/atom_api_web_contents.cc
+++ b/atom/browser/api/atom_api_web_contents.cc
@@ -7,7 +7,7 @@
 #include "atom/browser/atom_browser_context.h"
 #include "atom/browser/native_window.h"
 #include "atom/browser/web_dialog_helper.h"
-#include "atom/browser/web_view/web_view_manager.h"
+#include "atom/browser/web_view_manager.h"
 #include "atom/common/api/api_messages.h"
 #include "atom/common/native_mate_converters/gfx_converter.h"
 #include "atom/common/native_mate_converters/gurl_converter.h"
diff --git a/atom/browser/atom_browser_client.cc b/atom/browser/atom_browser_client.cc
index 6a92ab996e4..b81a86ae78e 100644
--- a/atom/browser/atom_browser_client.cc
+++ b/atom/browser/atom_browser_client.cc
@@ -9,7 +9,7 @@
 #include "atom/browser/atom_browser_main_parts.h"
 #include "atom/browser/atom_speech_recognition_manager_delegate.h"
 #include "atom/browser/native_window.h"
-#include "atom/browser/web_view/web_view_manager.h"
+#include "atom/browser/web_view_manager.h"
 #include "atom/browser/window_list.h"
 #include "atom/common/options_switches.h"
 #include "base/command_line.h"
diff --git a/atom/browser/atom_browser_context.cc b/atom/browser/atom_browser_context.cc
index 5fa88d560a7..f0a92af9a3f 100644
--- a/atom/browser/atom_browser_context.cc
+++ b/atom/browser/atom_browser_context.cc
@@ -7,7 +7,7 @@
 #include "atom/browser/atom_browser_main_parts.h"
 #include "atom/browser/net/atom_url_request_job_factory.h"
 #include "atom/browser/net/asar/asar_protocol_handler.h"
-#include "atom/browser/web_view/web_view_manager.h"
+#include "atom/browser/web_view_manager.h"
 #include "atom/common/options_switches.h"
 #include "base/command_line.h"
 #include "base/threading/sequenced_worker_pool.h"
diff --git a/atom/browser/web_view/web_view_manager.cc b/atom/browser/web_view_manager.cc
similarity index 99%
rename from atom/browser/web_view/web_view_manager.cc
rename to atom/browser/web_view_manager.cc
index 6d614574d5d..d57d0c84adf 100644
--- a/atom/browser/web_view/web_view_manager.cc
+++ b/atom/browser/web_view_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#include "atom/browser/web_view/web_view_manager.h"
+#include "atom/browser/web_view_manager.h"
 
 #include "atom/browser/api/atom_api_web_contents.h"
 #include "atom/browser/atom_browser_context.h"
diff --git a/atom/browser/web_view/web_view_manager.h b/atom/browser/web_view_manager.h
similarity index 95%
rename from atom/browser/web_view/web_view_manager.h
rename to atom/browser/web_view_manager.h
index b9ef039495d..2f5d8a650d5 100644
--- a/atom/browser/web_view/web_view_manager.h
+++ b/atom/browser/web_view_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_WEB_VIEW_WEB_VIEW_MANAGER_H_
-#define ATOM_BROWSER_WEB_VIEW_WEB_VIEW_MANAGER_H_
+#ifndef ATOM_BROWSER_WEB_VIEW_MANAGER_H_
+#define ATOM_BROWSER_WEB_VIEW_MANAGER_H_
 
 #include <map>
 
@@ -100,4 +100,4 @@ class WebViewManager : public content::BrowserPluginGuestManager {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_WEB_VIEW_WEB_VIEW_MANAGER_H_
+#endif  // ATOM_BROWSER_WEB_VIEW_MANAGER_H_