From 2cff005220a16c7d1f814d5495887823b634f077 Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Fri, 18 Mar 2011 16:51:44 +0000 Subject: [PATCH] Move render_widget files to content. TBR=avi Review URL: http://codereview.chromium.org/6709032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78703 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/chrome_renderer.gypi | 11 ----------- chrome/chrome_tests.gypi | 6 +++--- chrome/renderer/render_view.cc | 4 ++-- chrome/renderer/render_view.h | 2 +- .../phishing_thumbnailer_browsertest.cc | 2 +- content/content_renderer.gypi | 16 ++++++++++++++++ content/renderer/ggl.cc | 2 +- {chrome => content}/renderer/render_widget.cc | 2 +- {chrome => content}/renderer/render_widget.h | 6 +++--- .../renderer/render_widget_browsertest.cc | 3 ++- .../renderer/render_widget_browsertest.h | 6 +++--- .../renderer/render_widget_fullscreen.cc | 2 +- .../renderer/render_widget_fullscreen.h | 8 ++++---- .../renderer/render_widget_fullscreen_pepper.cc | 2 +- .../renderer/render_widget_fullscreen_pepper.h | 8 ++++---- .../renderer/render_widget_unittest.cc | 2 +- {chrome => content}/renderer/renderer.sb | 0 17 files changed, 44 insertions(+), 38 deletions(-) rename {chrome => content}/renderer/render_widget.cc (99%) rename {chrome => content}/renderer/render_widget.h (99%) rename {chrome => content}/renderer/render_widget_browsertest.cc (99%) rename {chrome => content}/renderer/render_widget_browsertest.h (91%) rename {chrome => content}/renderer/render_widget_fullscreen.cc (96%) rename {chrome => content}/renderer/render_widget_fullscreen.h (82%) rename {chrome => content}/renderer/render_widget_fullscreen_pepper.cc (99%) rename {chrome => content}/renderer/render_widget_fullscreen_pepper.h (91%) rename {chrome => content}/renderer/render_widget_unittest.cc (97%) rename {chrome => content}/renderer/renderer.sb (100%) diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi index dc65d2a55a9882..7908e2db8c5977 100644 --- a/chrome/chrome_renderer.gypi +++ b/chrome/chrome_renderer.gypi @@ -119,12 +119,6 @@ 'renderer/render_view.h', 'renderer/render_view_observer.cc', 'renderer/render_view_observer.h', - 'renderer/render_widget.cc', - 'renderer/render_widget.h', - 'renderer/render_widget_fullscreen.cc', - 'renderer/render_widget_fullscreen.h', - 'renderer/render_widget_fullscreen_pepper.cc', - 'renderer/render_widget_fullscreen_pepper.h', 'renderer/renderer_glue.cc', 'renderer/renderer_histogram_snapshots.cc', 'renderer/renderer_histogram_snapshots.h', @@ -179,11 +173,6 @@ 'renderer/visitedlink_slave.cc', 'renderer/visitedlink_slave.h', ], - 'link_settings': { - 'mac_bundle_resources': [ - 'renderer/renderer.sb', - ], - }, 'conditions': [ ['disable_nacl!=1', { 'dependencies': [ diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 39c15cd856a1a3..7ed376b8b0b141 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1753,7 +1753,6 @@ 'renderer/net/renderer_predictor_unittest.cc', 'renderer/render_process_unittest.cc', 'renderer/render_thread_unittest.cc', - 'renderer/render_widget_unittest.cc', 'renderer/renderer_about_handler_unittest.cc', 'renderer/renderer_main_unittest.cc', 'renderer/safe_browsing/features_unittest.cc', @@ -1840,6 +1839,7 @@ '../content/renderer/gpu_video_decoder_host_unittest.cc', '../content/renderer/media/audio_renderer_impl_unittest.cc', '../content/renderer/paint_aggregator_unittest.cc', + '../content/renderer/render_widget_unittest.cc', '../testing/gtest_mac_unittest.mm', '../third_party/cld/encodings/compact_lang_det/compact_lang_det_unittest_small.cc', '../webkit/fileapi/file_system_dir_url_request_job_unittest.cc', @@ -2293,8 +2293,6 @@ 'renderer/page_click_tracker_browsertest.cc', 'renderer/render_view_browsertest.cc', 'renderer/render_view_browsertest_mac.mm', - 'renderer/render_widget_browsertest.cc', - 'renderer/render_widget_browsertest.h', 'renderer/safe_browsing/malware_dom_details_browsertest.cc', 'renderer/safe_browsing/phishing_classifier_browsertest.cc', 'renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc', @@ -2322,6 +2320,8 @@ '../content/browser/webui/web_ui_handler_browsertest.cc', '../content/browser/webui/web_ui_handler_browsertest.h', '../content/common/file_path_watcher/file_path_watcher_browsertest.cc', + '../content/renderer/render_widget_browsertest.cc', + '../content/renderer/render_widget_browsertest.h', ], 'conditions': [ ['chromeos==0', { diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index fc07924d8ef489..a1f408a6ce6812 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -66,8 +66,6 @@ #include "chrome/renderer/render_thread.h" #include "chrome/renderer/render_view_observer.h" #include "chrome/renderer/render_view_visitor.h" -#include "chrome/renderer/render_widget_fullscreen.h" -#include "chrome/renderer/render_widget_fullscreen_pepper.h" #include "chrome/renderer/safe_browsing/malware_dom_details.h" #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h" #include "chrome/renderer/searchbox.h" @@ -99,6 +97,8 @@ #include "content/renderer/plugin_channel_host.h" #include "content/renderer/renderer_webapplicationcachehost_impl.h" #include "content/renderer/renderer_webstoragenamespace_impl.h" +#include "content/renderer/render_widget_fullscreen.h" +#include "content/renderer/render_widget_fullscreen_pepper.h" #include "content/renderer/speech_input_dispatcher.h" #include "content/renderer/webgraphicscontext3d_command_buffer_impl.h" #include "content/renderer/webplugin_delegate_proxy.h" diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h index 17bf70757d729b..0b32c1c7954a15 100644 --- a/chrome/renderer/render_view.h +++ b/chrome/renderer/render_view.h @@ -28,11 +28,11 @@ #include "chrome/common/view_types.h" #include "chrome/renderer/external_popup_menu.h" #include "chrome/renderer/page_load_histograms.h" -#include "chrome/renderer/render_widget.h" #include "content/renderer/renderer_webcookiejar_impl.h" #include "content/common/navigation_gesture.h" #include "content/common/page_zoom.h" #include "content/renderer/pepper_plugin_delegate_impl.h" +#include "content/renderer/render_widget.h" #include "ipc/ipc_platform_file.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityNotification.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h" diff --git a/chrome/renderer/safe_browsing/phishing_thumbnailer_browsertest.cc b/chrome/renderer/safe_browsing/phishing_thumbnailer_browsertest.cc index 10c4cf92040685..b57a5107956bf0 100644 --- a/chrome/renderer/safe_browsing/phishing_thumbnailer_browsertest.cc +++ b/chrome/renderer/safe_browsing/phishing_thumbnailer_browsertest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/basictypes.h" -#include "chrome/renderer/render_widget_browsertest.h" #include "chrome/renderer/safe_browsing/phishing_thumbnailer.h" +#include "content/renderer/render_widget_browsertest.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi index 7703967a114cf1..51b43651c1e3a5 100644 --- a/content/content_renderer.gypi +++ b/content/content_renderer.gypi @@ -72,6 +72,12 @@ 'renderer/pepper_plugin_delegate_impl.h', 'renderer/plugin_channel_host.cc', 'renderer/plugin_channel_host.h', + 'renderer/render_widget.cc', + 'renderer/render_widget.h', + 'renderer/render_widget_fullscreen.cc', + 'renderer/render_widget_fullscreen.h', + 'renderer/render_widget_fullscreen_pepper.cc', + 'renderer/render_widget_fullscreen_pepper.h', 'renderer/renderer_sandbox_support_linux.cc', 'renderer/renderer_sandbox_support_linux.h', 'renderer/renderer_webapplicationcachehost_impl.cc', @@ -130,6 +136,16 @@ '../build/linux/system.gyp:gtk', ], }], + ['OS=="mac"', { + 'sources!': [ + 'common/process_watcher_posix.cc', + ], + 'link_settings': { + 'mac_bundle_resources': [ + 'renderer/renderer.sb', + ], + }, + }], ], }, ], diff --git a/content/renderer/ggl.cc b/content/renderer/ggl.cc index cfb34c48754bcf..981d879a183d7e 100644 --- a/content/renderer/ggl.cc +++ b/content/renderer/ggl.cc @@ -7,11 +7,11 @@ #include "base/lazy_instance.h" #include "base/ref_counted.h" #include "base/weak_ptr.h" -#include "chrome/renderer/render_widget.h" #include "content/renderer/command_buffer_proxy.h" #include "content/renderer/gpu_channel_host.h" #include "content/renderer/gpu_video_service_host.h" #include "content/renderer/media/gles2_video_decode_context.h" +#include "content/renderer/render_widget.h" #include "ipc/ipc_channel_handle.h" #if defined(ENABLE_GPU) diff --git a/chrome/renderer/render_widget.cc b/content/renderer/render_widget.cc similarity index 99% rename from chrome/renderer/render_widget.cc rename to content/renderer/render_widget.cc index 2b47560c0aed18..47ebd21dcb8804 100644 --- a/chrome/renderer/render_widget.cc +++ b/content/renderer/render_widget.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 "chrome/renderer/render_widget.h" +#include "content/renderer/render_widget.h" #include "app/surface/transport_dib.h" #include "base/command_line.h" diff --git a/chrome/renderer/render_widget.h b/content/renderer/render_widget.h similarity index 99% rename from chrome/renderer/render_widget.h rename to content/renderer/render_widget.h index 8325718ac6cdc3..905a7a807eb634 100644 --- a/chrome/renderer/render_widget.h +++ b/content/renderer/render_widget.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 CHROME_RENDERER_RENDER_WIDGET_H_ -#define CHROME_RENDERER_RENDER_WIDGET_H_ +#ifndef CONTENT_RENDERER_RENDER_WIDGET_H_ +#define CONTENT_RENDERER_RENDER_WIDGET_H_ #pragma once #include @@ -378,4 +378,4 @@ class RenderWidget : public IPC::Channel::Listener, DISALLOW_COPY_AND_ASSIGN(RenderWidget); }; -#endif // CHROME_RENDERER_RENDER_WIDGET_H_ +#endif // CONTENT_RENDERER_RENDER_WIDGET_H_ diff --git a/chrome/renderer/render_widget_browsertest.cc b/content/renderer/render_widget_browsertest.cc similarity index 99% rename from chrome/renderer/render_widget_browsertest.cc rename to content/renderer/render_widget_browsertest.cc index 41192d0f5cf877..a1b46d28fa7901 100644 --- a/chrome/renderer/render_widget_browsertest.cc +++ b/content/renderer/render_widget_browsertest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "content/renderer/render_widget_browsertest.h" + #include "app/surface/transport_dib.h" #include "base/basictypes.h" #include "base/file_path.h" @@ -10,7 +12,6 @@ #include "base/stringprintf.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" -#include "chrome/renderer/render_widget_browsertest.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" diff --git a/chrome/renderer/render_widget_browsertest.h b/content/renderer/render_widget_browsertest.h similarity index 91% rename from chrome/renderer/render_widget_browsertest.h rename to content/renderer/render_widget_browsertest.h index 42ae02d81dfab6..f091efbd6424a1 100644 --- a/chrome/renderer/render_widget_browsertest.h +++ b/content/renderer/render_widget_browsertest.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 CHROME_RENDERER_RENDER_WIDGET_BROWSERTEST_H_ -#define CHROME_RENDERER_RENDER_WIDGET_BROWSERTEST_H_ +#ifndef CONTENT_RENDERER_RENDER_WIDGET_BROWSERTEST_H_ +#define CONTENT_RENDERER_RENDER_WIDGET_BROWSERTEST_H_ #pragma once #include "base/basictypes.h" @@ -55,4 +55,4 @@ class RenderWidgetTest : public RenderViewTest { void OutputBitmapToFile(const SkBitmap& bitmap, const FilePath& file_path); }; -#endif // CHROME_RENDERER_RENDER_WIDGET_BROWSERTEST_H_ +#endif // CONTENT_RENDERER_RENDER_WIDGET_BROWSERTEST_H_ diff --git a/chrome/renderer/render_widget_fullscreen.cc b/content/renderer/render_widget_fullscreen.cc similarity index 96% rename from chrome/renderer/render_widget_fullscreen.cc rename to content/renderer/render_widget_fullscreen.cc index 021b074711f53b..1fc5c6d4ca5714 100644 --- a/chrome/renderer/render_widget_fullscreen.cc +++ b/content/renderer/render_widget_fullscreen.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 "chrome/renderer/render_widget_fullscreen.h" +#include "content/renderer/render_widget_fullscreen.h" #include "chrome/common/render_messages.h" #include "chrome/renderer/render_thread.h" diff --git a/chrome/renderer/render_widget_fullscreen.h b/content/renderer/render_widget_fullscreen.h similarity index 82% rename from chrome/renderer/render_widget_fullscreen.h rename to content/renderer/render_widget_fullscreen.h index 3a875187f0a9ae..7e18037543b5da 100644 --- a/chrome/renderer/render_widget_fullscreen.h +++ b/content/renderer/render_widget_fullscreen.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_RENDERER_RENDER_WIDGET_FULLSCREEN_H_ -#define CHROME_RENDERER_RENDER_WIDGET_FULLSCREEN_H_ +#ifndef CONTENT_RENDERER_RENDER_WIDGET_FULLSCREEN_H_ +#define CONTENT_RENDERER_RENDER_WIDGET_FULLSCREEN_H_ -#include "chrome/renderer/render_widget.h" +#include "content/renderer/render_widget.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebWidget.h" @@ -27,4 +27,4 @@ class RenderWidgetFullscreen : public RenderWidget { void Init(int32 opener_id); }; -#endif // CHROME_RENDERER_RENDER_WIDGET_FULLSCREEN_H_ +#endif // CONTENT_RENDERER_RENDER_WIDGET_FULLSCREEN_H_ diff --git a/chrome/renderer/render_widget_fullscreen_pepper.cc b/content/renderer/render_widget_fullscreen_pepper.cc similarity index 99% rename from chrome/renderer/render_widget_fullscreen_pepper.cc rename to content/renderer/render_widget_fullscreen_pepper.cc index cd1f56a74f4013..128129bf58fffd 100644 --- a/chrome/renderer/render_widget_fullscreen_pepper.cc +++ b/content/renderer/render_widget_fullscreen_pepper.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 "chrome/renderer/render_widget_fullscreen_pepper.h" +#include "content/renderer/render_widget_fullscreen_pepper.h" #include "chrome/common/render_messages.h" #include "chrome/renderer/render_thread.h" diff --git a/chrome/renderer/render_widget_fullscreen_pepper.h b/content/renderer/render_widget_fullscreen_pepper.h similarity index 91% rename from chrome/renderer/render_widget_fullscreen_pepper.h rename to content/renderer/render_widget_fullscreen_pepper.h index 9e201da87582cb..a3905cee95b996 100644 --- a/chrome/renderer/render_widget_fullscreen_pepper.h +++ b/content/renderer/render_widget_fullscreen_pepper.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_RENDERER_RENDER_WIDGET_FULLSCREEN_PEPPER_H_ -#define CHROME_RENDERER_RENDER_WIDGET_FULLSCREEN_PEPPER_H_ +#ifndef CONTENT_RENDERER_RENDER_WIDGET_FULLSCREEN_PEPPER_H_ +#define CONTENT_RENDERER_RENDER_WIDGET_FULLSCREEN_PEPPER_H_ -#include "chrome/renderer/render_widget_fullscreen.h" +#include "content/renderer/render_widget_fullscreen.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebWidget.h" #include "webkit/plugins/ppapi/fullscreen_container.h" @@ -86,4 +86,4 @@ class RenderWidgetFullscreenPepper : public RenderWidgetFullscreen, DISALLOW_COPY_AND_ASSIGN(RenderWidgetFullscreenPepper); }; -#endif // CHROME_RENDERER_RENDER_WIDGET_FULLSCREEN_PEPPER_H_ +#endif // CONTENT_RENDERER_RENDER_WIDGET_FULLSCREEN_PEPPER_H_ diff --git a/chrome/renderer/render_widget_unittest.cc b/content/renderer/render_widget_unittest.cc similarity index 97% rename from chrome/renderer/render_widget_unittest.cc rename to content/renderer/render_widget_unittest.cc index 2703b7d9615bce..1811289980916f 100644 --- a/chrome/renderer/render_widget_unittest.cc +++ b/content/renderer/render_widget_unittest.cc @@ -7,8 +7,8 @@ #include "base/ref_counted.h" #include "chrome/renderer/mock_render_process.h" #include "chrome/renderer/mock_render_thread.h" -#include "chrome/renderer/render_widget.h" #include "chrome/renderer/render_thread.h" +#include "content/renderer/render_widget.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h" namespace { diff --git a/chrome/renderer/renderer.sb b/content/renderer/renderer.sb similarity index 100% rename from chrome/renderer/renderer.sb rename to content/renderer/renderer.sb