Move navigation and frame tree classes to a new frame_host/ directory.

content/content_browser.gypi

Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 98abad36a390fd7e3dc3e9aefe49b66a3857d348..807f0381feb43c9a1a84c060a87275a723d50280 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -501,6 +501,27 @@
     'browser/fileapi/fileapi_message_filter.cc',
     'browser/fileapi/fileapi_message_filter.h',
     'browser/font_list_async.cc',
+    'browser/frame_host/debug_urls.cc',
+    'browser/frame_host/debug_urls.h',
+    'browser/frame_host/frame_tree.cc',
+    'browser/frame_host/frame_tree.h',
+    'browser/frame_host/frame_tree_node.cc',
+    'browser/frame_host/frame_tree_node.h',
+    'browser/frame_host/interstitial_page_impl.cc',
+    'browser/frame_host/interstitial_page_impl.h',
+    'browser/frame_host/navigation_controller_delegate.h',
+    'browser/frame_host/navigation_controller_impl.cc',
+    'browser/frame_host/navigation_controller_impl.h',
+    'browser/frame_host/navigation_entry_impl.cc',
+    'browser/frame_host/navigation_entry_impl.h',
+    'browser/frame_host/render_frame_host_impl.cc',
+    'browser/frame_host/render_frame_host_impl.h',
+    'browser/frame_host/render_frame_message_filter.cc',
+    'browser/frame_host/render_frame_message_filter.h',
+    'browser/frame_host/render_view_host_manager.cc',
+    'browser/frame_host/render_view_host_manager.h',
+    'browser/frame_host/web_contents_screenshot_manager.cc',
+    'browser/frame_host/web_contents_screenshot_manager.h',
     'browser/gamepad/gamepad_data_fetcher.h',
     'browser/gamepad/gamepad_platform_data_fetcher.h',
     'browser/gamepad/gamepad_platform_data_fetcher_linux.cc',
@@ -789,10 +810,8 @@
     'browser/renderer_host/dip_util.h',
     'browser/renderer_host/file_utilities_message_filter.cc',
     'browser/renderer_host/file_utilities_message_filter.h',
-    'browser/renderer_host/frame_tree.cc',
-    'browser/renderer_host/frame_tree.h',
-    'browser/renderer_host/frame_tree_node.cc',
-    'browser/renderer_host/frame_tree_node.h',
+    'browser/renderer_host/software_frame_manager.cc',
+    'browser/renderer_host/software_frame_manager.h',

[Charlie Reis, 2013/10/29 16:36:39]

Merge conflict?

[nasko, 2013/10/29 16:47:22]

Wrong resolution of one, yes. Thanks for catching this one!

     'browser/renderer_host/gamepad_browser_message_filter.cc',
     'browser/renderer_host/gamepad_browser_message_filter.h',
     'browser/renderer_host/gpu_message_filter.cc',
@@ -974,10 +993,6 @@
     'browser/renderer_host/pepper/ssl_context_helper.h',
     'browser/renderer_host/popup_menu_helper_mac.h',
     'browser/renderer_host/popup_menu_helper_mac.mm',
-    'browser/renderer_host/render_frame_host_impl.cc',
-    'browser/renderer_host/render_frame_host_impl.h',
-    'browser/renderer_host/render_frame_message_filter.cc',
-    'browser/renderer_host/render_frame_message_filter.h',
     'browser/renderer_host/render_message_filter.cc',
     'browser/renderer_host/render_message_filter.h',
     'browser/renderer_host/render_process_host_impl.cc',
@@ -1142,27 +1157,14 @@
     'browser/web_contents/aura/shadow_layer_delegate.h',
     'browser/web_contents/aura/window_slider.cc',
     'browser/web_contents/aura/window_slider.h',
-    'browser/web_contents/debug_urls.cc',
-    'browser/web_contents/debug_urls.h',
     'browser/web_contents/drag_utils_gtk.cc',
     'browser/web_contents/drag_utils_gtk.h',
-    'browser/web_contents/interstitial_page_impl.cc',
-    'browser/web_contents/interstitial_page_impl.h',
-    'browser/web_contents/navigation_controller_delegate.h',
-    'browser/web_contents/navigation_controller_impl.cc',
-    'browser/web_contents/navigation_controller_impl.h',
-    'browser/web_contents/navigation_entry_impl.cc',
-    'browser/web_contents/navigation_entry_impl.h',
-    'browser/web_contents/render_view_host_manager.cc',
-    'browser/web_contents/render_view_host_manager.h',
     'browser/web_contents/touch_editable_impl_aura.cc',
     'browser/web_contents/touch_editable_impl_aura.h',
     'browser/web_contents/web_contents_drag_win.cc',
     'browser/web_contents/web_contents_drag_win.h',
     'browser/web_contents/web_contents_impl.cc',
     'browser/web_contents/web_contents_impl.h',
-    'browser/web_contents/web_contents_screenshot_manager.cc',
-    'browser/web_contents/web_contents_screenshot_manager.h',
     'browser/web_contents/web_contents_view_android.cc',
     'browser/web_contents/web_contents_view_android.h',
     'browser/web_contents/web_contents_view_aura.cc',