diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-11 15:19:00 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-11 15:19:00 +0000 |
| commit | 0c4e92e6434bb8936aca2e03fe8d44201cb51089 (patch) | |
| tree | 0099a309042789a21e2e3a51c13dc2a8051a30fb | |
| parent | 51808a91fef99c0d0849f143f772cb1bbc11f2e4 (diff) | |
| download | chromium_src-0c4e92e6434bb8936aca2e03fe8d44201cb51089.zip chromium_src-0c4e92e6434bb8936aca2e03fe8d44201cb51089.tar.gz chromium_src-0c4e92e6434bb8936aca2e03fe8d44201cb51089.tar.bz2 | |
TabContents -> WebContentsImpl, part 4.
BUG=105875
TEST=no change
Review URL: https://chromiumcodereview.appspot.com/10024066
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131770 0039d316-1c4b-4281-b951-d872f2087c98
33 files changed, 62 insertions, 62 deletions
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index 089152f..8837941 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -40,7 +40,7 @@ include_rules = [ # TODO(ben): http://crbug.com/118410 will fix the following: "+content/browser/renderer_host/render_view_host_factory.h", "+content/browser/tab_contents/tab_contents_view_helper.h", - "+content/browser/tab_contents/web_contents_drag_win.h", + "+content/browser/web_contents/web_contents_drag_win.h", "+content/browser/web_contents/web_drag_dest_win.h", # DO NOT ADD ANY MORE ITEMS TO THE ABOVE LIST! diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc index 8e060c7..76a26fb 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc @@ -9,7 +9,7 @@ #include "chrome/browser/tab_contents/web_drag_bookmark_handler_win.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_delegate.h" -#include "content/browser/tab_contents/web_contents_drag_win.h" +#include "content/browser/web_contents/web_contents_drag_win.h" #include "content/browser/web_contents/web_drag_dest_win.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" diff --git a/content/browser/debugger/devtools_manager_unittest.cc b/content/browser/debugger/devtools_manager_unittest.cc index dfc0f40..1d8b499 100644 --- a/content/browser/debugger/devtools_manager_unittest.cc +++ b/content/browser/debugger/devtools_manager_unittest.cc @@ -8,7 +8,7 @@ #include "content/browser/debugger/render_view_devtools_agent_host.h" #include "content/browser/mock_content_browser_client.h" #include "content/browser/renderer_host/test_render_view_host.h" -#include "content/browser/tab_contents/test_web_contents.h" +#include "content/browser/web_contents/test_web_contents.h" #include "content/common/view_messages.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/devtools_agent_host_registry.h" diff --git a/content/browser/download/save_package_unittest.cc b/content/browser/download/save_package_unittest.cc index 3abcb69..74b73f0 100644 --- a/content/browser/download/save_package_unittest.cc +++ b/content/browser/download/save_package_unittest.cc @@ -12,7 +12,7 @@ #include "content/browser/browser_thread_impl.h" #include "content/browser/download/save_package.h" #include "content/browser/renderer_host/test_render_view_host.h" -#include "content/browser/tab_contents/test_web_contents.h" +#include "content/browser/web_contents/test_web_contents.h" #include "content/test/net/url_request_mock_http_job.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/browser/intents/intent_injector_unittest.cc b/content/browser/intents/intent_injector_unittest.cc index bcfdb55..657df55 100644 --- a/content/browser/intents/intent_injector_unittest.cc +++ b/content/browser/intents/intent_injector_unittest.cc @@ -7,7 +7,7 @@ #include "content/browser/intents/intent_injector.h" #include "content/browser/intents/internal_web_intents_dispatcher.h" #include "content/browser/renderer_host/test_render_view_host.h" -#include "content/browser/tab_contents/test_web_contents.h" +#include "content/browser/web_contents/test_web_contents.h" #include "content/common/intents_messages.h" #include "content/common/view_messages.h" #include "content/test/web_contents_tester.h" diff --git a/content/browser/intents/internal_web_intents_dispatcher_unittest.cc b/content/browser/intents/internal_web_intents_dispatcher_unittest.cc index dbdb64d..d5bbafa 100644 --- a/content/browser/intents/internal_web_intents_dispatcher_unittest.cc +++ b/content/browser/intents/internal_web_intents_dispatcher_unittest.cc @@ -7,7 +7,7 @@ #include "content/browser/intents/intent_injector.h" #include "content/browser/intents/internal_web_intents_dispatcher.h" #include "content/browser/renderer_host/test_render_view_host.h" -#include "content/browser/tab_contents/test_web_contents.h" +#include "content/browser/web_contents/test_web_contents.h" #include "webkit/glue/web_intent_data.h" #include "webkit/glue/web_intent_reply_data.h" diff --git a/content/browser/renderer_host/render_view_host_unittest.cc b/content/browser/renderer_host/render_view_host_unittest.cc index 66f594b..dda6131 100644 --- a/content/browser/renderer_host/render_view_host_unittest.cc +++ b/content/browser/renderer_host/render_view_host_unittest.cc @@ -4,8 +4,8 @@ #include "content/browser/child_process_security_policy_impl.h" #include "content/browser/renderer_host/test_render_view_host.h" -#include "content/browser/tab_contents/test_web_contents.h" #include "content/browser/web_contents/navigation_controller_impl.h" +#include "content/browser/web_contents/test_web_contents.h" #include "content/common/view_messages.h" #include "content/public/browser/navigation_entry.h" #include "content/public/common/bindings_policy.h" diff --git a/content/browser/renderer_host/test_render_view_host.cc b/content/browser/renderer_host/test_render_view_host.cc index a50e085..7f6da61a 100644 --- a/content/browser/renderer_host/test_render_view_host.cc +++ b/content/browser/renderer_host/test_render_view_host.cc @@ -5,8 +5,8 @@ #include "content/browser/renderer_host/test_backing_store.h" #include "content/browser/renderer_host/test_render_view_host.h" #include "content/browser/site_instance_impl.h" -#include "content/browser/tab_contents/test_web_contents.h" #include "content/browser/web_contents/navigation_controller_impl.h" +#include "content/browser/web_contents/test_web_contents.h" #include "content/common/dom_storage_common.h" #include "content/common/view_messages.h" #include "content/public/browser/navigation_controller.h" diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc index 37e2bef..0c555a1 100644 --- a/content/browser/tab_contents/tab_contents.cc +++ b/content/browser/tab_contents/tab_contents.cc @@ -72,10 +72,10 @@ #elif defined(TOOLKIT_GTK) #include "content/browser/tab_contents/tab_contents_view_gtk.h" #elif defined(OS_MACOSX) -#include "content/browser/tab_contents/web_contents_view_mac.h" +#include "content/browser/web_contents/web_contents_view_mac.h" #include "ui/gfx/surface/io_surface_support_mac.h" #elif defined(OS_ANDROID) -#include "content/browser/tab_contents/web_contents_view_android.h" +#include "content/browser/web_contents/web_contents_view_android.h" #endif // Cross-Site Navigations diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h index d47d4eb..8dbea62 100644 --- a/content/browser/tab_contents/tab_contents.h +++ b/content/browser/tab_contents/tab_contents.h @@ -16,8 +16,8 @@ #include "base/property_bag.h" #include "content/browser/browser_plugin/browser_plugin_web_contents_observer.h" #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h" -#include "content/browser/tab_contents/render_view_host_manager.h" #include "content/browser/web_contents/navigation_controller_impl.h" +#include "content/browser/web_contents/render_view_host_manager.h" #include "content/common/content_export.h" #include "content/public/browser/render_view_host_delegate.h" #include "content/public/browser/web_contents.h" diff --git a/content/browser/tab_contents/tab_contents_unittest.cc b/content/browser/tab_contents/tab_contents_unittest.cc index 37e2455..f6bb059 100644 --- a/content/browser/tab_contents/tab_contents_unittest.cc +++ b/content/browser/tab_contents/tab_contents_unittest.cc @@ -8,9 +8,9 @@ #include "content/browser/renderer_host/render_view_host_impl.h" #include "content/browser/renderer_host/test_render_view_host.h" #include "content/browser/site_instance_impl.h" -#include "content/browser/tab_contents/test_web_contents.h" #include "content/browser/web_contents/interstitial_page_impl.h" #include "content/browser/web_contents/navigation_entry_impl.h" +#include "content/browser/web_contents/test_web_contents.h" #include "content/common/view_messages.h" #include "content/public/browser/interstitial_page_delegate.h" #include "content/public/browser/navigation_details.h" diff --git a/content/browser/tab_contents/tab_contents_view_win.cc b/content/browser/tab_contents/tab_contents_view_win.cc index 83c6d79..f0e4f4b 100644 --- a/content/browser/tab_contents/tab_contents_view_win.cc +++ b/content/browser/tab_contents/tab_contents_view_win.cc @@ -9,8 +9,8 @@ #include "content/browser/renderer_host/render_view_host_impl.h" #include "content/browser/renderer_host/render_widget_host_view_win.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/browser/tab_contents/web_contents_drag_win.h" #include "content/browser/web_contents/interstitial_page_impl.h" +#include "content/browser/web_contents/web_contents_drag_win.h" #include "content/browser/web_contents/web_drag_dest_win.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/browser/web_contents_view_delegate.h" diff --git a/content/browser/web_contents/navigation_controller_impl_unittest.cc b/content/browser/web_contents/navigation_controller_impl_unittest.cc index 023e83d..fafed78 100644 --- a/content/browser/web_contents/navigation_controller_impl_unittest.cc +++ b/content/browser/web_contents/navigation_controller_impl_unittest.cc @@ -19,9 +19,9 @@ #include "content/browser/renderer_host/test_render_view_host.h" #include "content/browser/site_instance_impl.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/browser/tab_contents/test_web_contents.h" #include "content/browser/web_contents/navigation_controller_impl.h" #include "content/browser/web_contents/navigation_entry_impl.h" +#include "content/browser/web_contents/test_web_contents.h" #include "content/common/view_messages.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/notification_registrar.h" diff --git a/content/browser/tab_contents/popup_menu_helper_mac.h b/content/browser/web_contents/popup_menu_helper_mac.h index 1c10a9e..4f9ae0d 100644 --- a/content/browser/tab_contents/popup_menu_helper_mac.h +++ b/content/browser/web_contents/popup_menu_helper_mac.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_BROWSER_TAB_CONTENTS_POPUP_MENU_HELPER_MAC_H_ -#define CONTENT_BROWSER_TAB_CONTENTS_POPUP_MENU_HELPER_MAC_H_ +#ifndef CONTENT_BROWSER_WEB_CONTENTS_POPUP_MENU_HELPER_MAC_H_ +#define CONTENT_BROWSER_WEB_CONTENTS_POPUP_MENU_HELPER_MAC_H_ #include <vector> @@ -48,4 +48,4 @@ class PopupMenuHelper : public content::NotificationObserver { DISALLOW_COPY_AND_ASSIGN(PopupMenuHelper); }; -#endif // CONTENT_BROWSER_TAB_CONTENTS_POPUP_MENU_HELPER_MAC_H_ +#endif // CONTENT_BROWSER_WEB_CONTENTS_POPUP_MENU_HELPER_MAC_H_ diff --git a/content/browser/tab_contents/popup_menu_helper_mac.mm b/content/browser/web_contents/popup_menu_helper_mac.mm index 0d7aaf2..cf40573 100644 --- a/content/browser/tab_contents/popup_menu_helper_mac.mm +++ b/content/browser/web_contents/popup_menu_helper_mac.mm @@ -4,7 +4,7 @@ #import <Carbon/Carbon.h> -#include "content/browser/tab_contents/popup_menu_helper_mac.h" +#include "content/browser/web_contents/popup_menu_helper_mac.h" #import "base/mac/scoped_sending_event.h" #include "base/memory/scoped_nsobject.h" diff --git a/content/browser/tab_contents/render_view_host_manager.cc b/content/browser/web_contents/render_view_host_manager.cc index b2bc52a..d00076e 100644 --- a/content/browser/tab_contents/render_view_host_manager.cc +++ b/content/browser/web_contents/render_view_host_manager.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/browser/tab_contents/render_view_host_manager.h" +#include "content/browser/web_contents/render_view_host_manager.h" #include <utility> diff --git a/content/browser/tab_contents/render_view_host_manager.h b/content/browser/web_contents/render_view_host_manager.h index 89462f6..d0c9232 100644 --- a/content/browser/tab_contents/render_view_host_manager.h +++ b/content/browser/web_contents/render_view_host_manager.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_ -#define CONTENT_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_ +#ifndef CONTENT_BROWSER_WEB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_ +#define CONTENT_BROWSER_WEB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_ #pragma once #include "base/basictypes.h" @@ -294,4 +294,4 @@ class CONTENT_EXPORT RenderViewHostManager DISALLOW_COPY_AND_ASSIGN(RenderViewHostManager); }; -#endif // CONTENT_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_ +#endif // CONTENT_BROWSER_WEB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_ diff --git a/content/browser/tab_contents/render_view_host_manager_unittest.cc b/content/browser/web_contents/render_view_host_manager_unittest.cc index 236cfd1..fc10594c 100644 --- a/content/browser/tab_contents/render_view_host_manager_unittest.cc +++ b/content/browser/web_contents/render_view_host_manager_unittest.cc @@ -7,10 +7,10 @@ #include "content/browser/mock_content_browser_client.h" #include "content/browser/renderer_host/test_render_view_host.h" #include "content/browser/site_instance_impl.h" -#include "content/browser/tab_contents/render_view_host_manager.h" -#include "content/browser/tab_contents/test_web_contents.h" #include "content/browser/web_contents/navigation_entry_impl.h" #include "content/browser/web_contents/navigation_controller_impl.h" +#include "content/browser/web_contents/render_view_host_manager.h" +#include "content/browser/web_contents/test_web_contents.h" #include "content/common/test_url_constants.h" #include "content/common/view_messages.h" #include "content/public/browser/notification_details.h" diff --git a/content/browser/tab_contents/test_web_contents.cc b/content/browser/web_contents/test_web_contents.cc index 445d578..36292b7 100644 --- a/content/browser/tab_contents/test_web_contents.cc +++ b/content/browser/web_contents/test_web_contents.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/browser/tab_contents/test_web_contents.h" +#include "content/browser/web_contents/test_web_contents.h" #include <utility> diff --git a/content/browser/tab_contents/test_web_contents.h b/content/browser/web_contents/test_web_contents.h index aa2ea71..e1dd241 100644 --- a/content/browser/tab_contents/test_web_contents.h +++ b/content/browser/web_contents/test_web_contents.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_BROWSER_TAB_CONTENTS_TEST_WEB_CONTENTS_H_ -#define CONTENT_BROWSER_TAB_CONTENTS_TEST_WEB_CONTENTS_H_ +#ifndef CONTENT_BROWSER_WEB_CONTENTS_TEST_WEB_CONTENTS_H_ +#define CONTENT_BROWSER_WEB_CONTENTS_TEST_WEB_CONTENTS_H_ #pragma once #include "content/browser/tab_contents/tab_contents.h" @@ -98,4 +98,4 @@ class TestWebContents : public TabContents, public WebContentsTester { } // namespace content -#endif // CONTENT_BROWSER_TAB_CONTENTS_TEST_WEB_CONTENTS_H_ +#endif // CONTENT_BROWSER_WEB_CONTENTS_TEST_WEB_CONTENTS_H_ diff --git a/content/browser/tab_contents/tab_contents_delegate_unittest.cc b/content/browser/web_contents/web_contents_delegate_unittest.cc index b2183f48..b2183f48 100644 --- a/content/browser/tab_contents/tab_contents_delegate_unittest.cc +++ b/content/browser/web_contents/web_contents_delegate_unittest.cc diff --git a/content/browser/tab_contents/web_contents_drag_win.cc b/content/browser/web_contents/web_contents_drag_win.cc index cbf0178..5ef13e5 100644 --- a/content/browser/tab_contents/web_contents_drag_win.cc +++ b/content/browser/web_contents/web_contents_drag_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/browser/tab_contents/web_contents_drag_win.h" +#include "content/browser/web_contents/web_contents_drag_win.h" #include <windows.h> diff --git a/content/browser/tab_contents/web_contents_drag_win.h b/content/browser/web_contents/web_contents_drag_win.h index 7801828..ead095c 100644 --- a/content/browser/tab_contents/web_contents_drag_win.h +++ b/content/browser/web_contents/web_contents_drag_win.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_BROWSER_TAB_CONTENTS_WEB_CONTENTS_DRAG_WIN_H_ -#define CONTENT_BROWSER_TAB_CONTENTS_WEB_CONTENTS_DRAG_WIN_H_ +#ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_DRAG_WIN_H_ +#define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_DRAG_WIN_H_ #pragma once #include "base/callback.h" @@ -111,4 +111,4 @@ class CONTENT_EXPORT WebContentsDragWin DISALLOW_COPY_AND_ASSIGN(WebContentsDragWin); }; -#endif // CONTENT_BROWSER_TAB_CONTENTS_WEB_CONTENTS_DRAG_WIN_H_ +#endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_DRAG_WIN_H_ diff --git a/content/browser/tab_contents/web_contents_view_android.cc b/content/browser/web_contents/web_contents_view_android.cc index cc67789..c16569f 100644 --- a/content/browser/tab_contents/web_contents_view_android.cc +++ b/content/browser/web_contents/web_contents_view_android.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/browser/tab_contents/web_contents_view_android.h" +#include "content/browser/web_contents/web_contents_view_android.h" #include "base/logging.h" #include "content/browser/renderer_host/render_view_host_impl.h" diff --git a/content/browser/tab_contents/web_contents_view_android.h b/content/browser/web_contents/web_contents_view_android.h index 72e8530..797adb7 100644 --- a/content/browser/tab_contents/web_contents_view_android.h +++ b/content/browser/web_contents/web_contents_view_android.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_ -#define CONTENT_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_ +#ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_ +#define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_ #pragma once #include "content/public/browser/web_contents_view.h" @@ -75,4 +75,4 @@ class WebContentsViewAndroid : public content::WebContentsView { DISALLOW_COPY_AND_ASSIGN(WebContentsViewAndroid); }; -#endif // CONTENT_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_ +#endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_ANDROID_H_ diff --git a/content/browser/tab_contents/web_contents_view_mac.h b/content/browser/web_contents/web_contents_view_mac.h index 5b80c03..e8a0899 100644 --- a/content/browser/tab_contents/web_contents_view_mac.h +++ b/content/browser/web_contents/web_contents_view_mac.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_ -#define CONTENT_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_ +#ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_ +#define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_ #pragma once #if defined(__OBJC__) @@ -154,4 +154,4 @@ CONTENT_EXPORT content::WebContentsView* CreateWebContentsView( content::WebContentsViewDelegate* delegate); } -#endif // CONTENT_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_ +#endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_ diff --git a/content/browser/tab_contents/web_contents_view_mac.mm b/content/browser/web_contents/web_contents_view_mac.mm index 3e5e005..0e49d0c 100644 --- a/content/browser/tab_contents/web_contents_view_mac.mm +++ b/content/browser/web_contents/web_contents_view_mac.mm @@ -4,7 +4,7 @@ #import <Carbon/Carbon.h> -#import "content/browser/tab_contents/web_contents_view_mac.h" +#import "content/browser/web_contents/web_contents_view_mac.h" #include <string> @@ -13,8 +13,8 @@ #include "content/browser/renderer_host/render_view_host_factory.h" #include "content/browser/renderer_host/render_view_host_impl.h" #include "content/browser/renderer_host/render_widget_host_view_mac.h" -#include "content/browser/tab_contents/popup_menu_helper_mac.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/web_contents/popup_menu_helper_mac.h" #import "content/browser/web_contents/web_drag_dest_mac.h" #import "content/browser/web_contents/web_drag_source_mac.h" #include "content/common/view_messages.h" diff --git a/content/browser/tab_contents/web_contents_view_mac_unittest.mm b/content/browser/web_contents/web_contents_view_mac_unittest.mm index 9c9433d..e1ef379 100644 --- a/content/browser/tab_contents/web_contents_view_mac_unittest.mm +++ b/content/browser/web_contents/web_contents_view_mac_unittest.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "content/browser/tab_contents/web_contents_view_mac.h" +#import "content/browser/web_contents/web_contents_view_mac.h" #include "base/memory/scoped_nsobject.h" #import "ui/base/test/ui_cocoa_test_helper.h" diff --git a/content/browser/web_contents/web_drag_dest_mac_unittest.mm b/content/browser/web_contents/web_drag_dest_mac_unittest.mm index 9d8cda4..ec07e28 100644 --- a/content/browser/web_contents/web_drag_dest_mac_unittest.mm +++ b/content/browser/web_contents/web_drag_dest_mac_unittest.mm @@ -7,7 +7,7 @@ #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "content/browser/renderer_host/test_render_view_host.h" -#include "content/browser/tab_contents/test_web_contents.h" +#include "content/browser/web_contents/test_web_contents.h" #import "content/browser/web_contents/web_drag_dest_mac.h" #include "testing/gtest/include/gtest/gtest.h" #import "third_party/mozilla/NSPasteboard+Utils.h" diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 73353ae..3367bb9 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -651,10 +651,6 @@ 'browser/ssl/ssl_request_info.h', 'browser/system_message_window_win.cc', 'browser/system_message_window_win.h', - 'browser/tab_contents/popup_menu_helper_mac.h', - 'browser/tab_contents/popup_menu_helper_mac.mm', - 'browser/tab_contents/render_view_host_manager.cc', - 'browser/tab_contents/render_view_host_manager.h', 'browser/tab_contents/tab_contents.cc', 'browser/tab_contents/tab_contents.h', 'browser/tab_contents/tab_contents_view_aura.cc', @@ -665,12 +661,6 @@ 'browser/tab_contents/tab_contents_view_helper.h', 'browser/tab_contents/tab_contents_view_win.cc', 'browser/tab_contents/tab_contents_view_win.h', - 'browser/tab_contents/web_contents_drag_win.cc', - 'browser/tab_contents/web_contents_drag_win.h', - 'browser/tab_contents/web_contents_view_android.cc', - 'browser/tab_contents/web_contents_view_android.h', - 'browser/tab_contents/web_contents_view_mac.h', - 'browser/tab_contents/web_contents_view_mac.mm', 'browser/web_contents/debug_urls.cc', 'browser/web_contents/debug_urls.h', 'browser/web_contents/drag_utils_gtk.cc', @@ -681,6 +671,16 @@ 'browser/web_contents/navigation_controller_impl.h', 'browser/web_contents/navigation_entry_impl.cc', 'browser/web_contents/navigation_entry_impl.h', + 'browser/web_contents/popup_menu_helper_mac.h', + 'browser/web_contents/popup_menu_helper_mac.mm', + 'browser/web_contents/render_view_host_manager.cc', + 'browser/web_contents/render_view_host_manager.h', + 'browser/web_contents/web_contents_drag_win.cc', + 'browser/web_contents/web_contents_drag_win.h', + 'browser/web_contents/web_contents_view_android.cc', + 'browser/web_contents/web_contents_view_android.h', + 'browser/web_contents/web_contents_view_mac.h', + 'browser/web_contents/web_contents_view_mac.mm', 'browser/web_contents/web_drag_dest_gtk.cc', 'browser/web_contents/web_drag_dest_gtk.h', 'browser/web_contents/web_drag_dest_mac.h', @@ -873,8 +873,8 @@ ['exclude', '^browser/renderer_host/tap_suppression_controller.cc'], ['exclude', '^browser/tab_contents/tab_contents_view_win.cc'], ['exclude', '^browser/tab_contents/tab_contents_view_win.h'], - ['exclude', '^browser/tab_contents/web_contents_drag_win.cc'], - ['exclude', '^browser/tab_contents/web_contents_drag_win.h'], + ['exclude', '^browser/web_contents/web_contents_drag_win.cc'], + ['exclude', '^browser/web_contents/web_contents_drag_win.h'], ['exclude', '^browser/web_contents/web_drag_dest_win.cc'], ['exclude', '^browser/web_contents/web_drag_dest_win.h'], ['exclude', '^browser/web_contents/web_drag_source_win.cc'], diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 3970502..dc69685 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -42,8 +42,8 @@ 'browser/renderer_host/test_backing_store.h', 'browser/renderer_host/test_render_view_host.cc', 'browser/renderer_host/test_render_view_host.h', - 'browser/tab_contents/test_web_contents.cc', - 'browser/tab_contents/test_web_contents.h', + 'browser/web_contents/test_web_contents.cc', + 'browser/web_contents/test_web_contents.h', 'common/test_url_constants.cc', 'common/test_url_constants.h', 'gpu/gpu_idirect3d9_mock_win.cc', @@ -255,13 +255,13 @@ 'browser/speech/speech_recognizer_impl_unittest.cc', 'browser/ssl/ssl_host_state_unittest.cc', 'browser/system_message_window_win_unittest.cc', - 'browser/tab_contents/render_view_host_manager_unittest.cc', - 'browser/tab_contents/tab_contents_delegate_unittest.cc', 'browser/tab_contents/tab_contents_unittest.cc', - 'browser/tab_contents/web_contents_view_mac_unittest.mm', 'browser/trace_subscriber_stdio_unittest.cc', 'browser/web_contents/navigation_controller_impl_unittest.cc', 'browser/web_contents/navigation_entry_impl_unittest.cc', + 'browser/web_contents/render_view_host_manager_unittest.cc', + 'browser/web_contents/web_contents_delegate_unittest.cc', + 'browser/web_contents/web_contents_view_mac_unittest.mm', 'browser/web_contents/web_drag_dest_mac_unittest.mm', 'browser/webui/web_ui_message_handler_unittest.cc', 'common/mac/attributed_string_coder_unittest.mm', diff --git a/content/test/test_renderer_host.cc b/content/test/test_renderer_host.cc index cd8c4d5..767eaa5 100644 --- a/content/test/test_renderer_host.cc +++ b/content/test/test_renderer_host.cc @@ -7,8 +7,8 @@ #include "content/browser/renderer_host/render_view_host_factory.h" #include "content/browser/renderer_host/test_render_view_host.h" #include "content/browser/site_instance_impl.h" -#include "content/browser/tab_contents/test_web_contents.h" #include "content/browser/web_contents/navigation_entry_impl.h" +#include "content/browser/web_contents/test_web_contents.h" #include "content/public/browser/web_contents.h" #include "content/test/mock_render_process_host.h" #include "content/test/test_browser_context.h" diff --git a/content/test/web_contents_tester.cc b/content/test/web_contents_tester.cc index e58054a..e6c9a2a 100644 --- a/content/test/web_contents_tester.cc +++ b/content/test/web_contents_tester.cc @@ -4,7 +4,7 @@ #include "content/test/web_contents_tester.h" -#include "content/browser/tab_contents/test_web_contents.h" +#include "content/browser/web_contents/test_web_contents.h" namespace content { |