diff options
author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-11 21:40:40 +0000 |
---|---|---|
committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-11 21:40:40 +0000 |
commit | 4d395d09e1d9bc18d86e1668f6a47830dd6c16a0 (patch) | |
tree | 0aa64c12e4a1798ce22f817ce491436ced8343b9 /chrome | |
parent | 489eb991b240069e8f29488ef58a3ccf3fa55d4f (diff) | |
download | chromium_src-4d395d09e1d9bc18d86e1668f6a47830dd6c16a0.zip chromium_src-4d395d09e1d9bc18d86e1668f6a47830dd6c16a0.tar.gz chromium_src-4d395d09e1d9bc18d86e1668f6a47830dd6c16a0.tar.bz2 |
Reverting 9594.
Review URL: http://codereview.chromium.org/20276
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9599 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/renderer/about_handler.h | 1 | ||||
-rw-r--r-- | chrome/renderer/chrome_plugin_host.cc | 1 | ||||
-rw-r--r-- | chrome/renderer/render_process.h | 5 | ||||
-rw-r--r-- | chrome/renderer/render_thread.h | 11 | ||||
-rw-r--r-- | chrome/renderer/render_view.cc | 2 | ||||
-rw-r--r-- | chrome/renderer/render_view.h | 11 | ||||
-rw-r--r-- | chrome/renderer/render_widget.h | 2 | ||||
-rw-r--r-- | chrome/renderer/renderer_glue.cc | 7 | ||||
-rw-r--r-- | chrome/renderer/user_script_slave.cc | 1 | ||||
-rw-r--r-- | chrome/renderer/user_script_slave.h | 4 | ||||
-rw-r--r-- | chrome/renderer/webmediaplayer_delegate_impl.h | 5 | ||||
-rw-r--r-- | chrome/renderer/webplugin_delegate_proxy.h | 4 |
12 files changed, 25 insertions, 29 deletions
diff --git a/chrome/renderer/about_handler.h b/chrome/renderer/about_handler.h index d79f341..02c354b 100644 --- a/chrome/renderer/about_handler.h +++ b/chrome/renderer/about_handler.h @@ -41,3 +41,4 @@ class AboutHandler { }; #endif // CHROME_RENDERER_ABOUT_HANDLER_H__ + diff --git a/chrome/renderer/chrome_plugin_host.cc b/chrome/renderer/chrome_plugin_host.cc index 6f793b7..27bdcb2 100644 --- a/chrome/renderer/chrome_plugin_host.cc +++ b/chrome/renderer/chrome_plugin_host.cc @@ -11,7 +11,6 @@ #include "chrome/common/chrome_plugin_util.h" #include "chrome/common/render_messages.h" #include "chrome/common/resource_dispatcher.h" -#include "chrome/renderer/render_thread.h" #include "chrome/renderer/render_view.h" #include "net/base/data_url.h" #include "net/base/upload_data.h" diff --git a/chrome/renderer/render_process.h b/chrome/renderer/render_process.h index 6ba0905..df96a2c 100644 --- a/chrome/renderer/render_process.h +++ b/chrome/renderer/render_process.h @@ -5,13 +5,10 @@ #ifndef CHROME_RENDERER_RENDER_PROCESS_H__ #define CHROME_RENDERER_RENDER_PROCESS_H__ +#include "base/shared_memory.h" #include "chrome/common/child_process.h" #include "chrome/renderer/render_thread.h" -namespace base { - class SharedMemory; -} - // Represents the renderer end of the browser<->renderer connection. The // opposite end is the RenderProcessHost. This is a singleton object for // each renderer. diff --git a/chrome/renderer/render_thread.h b/chrome/renderer/render_thread.h index 44dd548..7d6bca0 100644 --- a/chrome/renderer/render_thread.h +++ b/chrome/renderer/render_thread.h @@ -7,22 +7,23 @@ #include <vector> +#include "base/file_path.h" #include "base/gfx/native_widget_types.h" +#include "base/ref_counted.h" #include "base/shared_memory.h" #include "base/task.h" #include "base/thread.h" #include "build/build_config.h" #include "chrome/common/ipc_sync_channel.h" #include "chrome/common/message_router.h" +#include "chrome/common/modal_dialog_event.h" -class FilePath; -class NotificationService; -class RenderDnsMaster; class SkBitmap; -class UserScriptSlave; class VisitedLinkSlave; -struct ModalDialogEvent; struct WebPreferences; +class RenderDnsMaster; +class NotificationService; +class UserScriptSlave; // The RenderThreadBase is the minimal interface that a RenderView/Widget // expects from a render thread. The interface basically abstracts a way to send diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 062cde4..01af96b 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -26,7 +26,6 @@ #include "chrome/renderer/about_handler.h" #include "chrome/renderer/debug_message_handler.h" #include "chrome/renderer/localized_error.h" -#include "chrome/renderer/render_process.h" #include "chrome/renderer/renderer_resources.h" #include "chrome/renderer/user_script_slave.h" #include "chrome/renderer/visitedlink_slave.h" @@ -39,7 +38,6 @@ #include "webkit/default_plugin/default_plugin_shared.h" #include "webkit/glue/dom_operations.h" #include "webkit/glue/dom_serializer.h" -#include "webkit/glue/glue_accessibility.h" #include "webkit/glue/password_form.h" #include "webkit/glue/plugins/plugin_list.h" #include "webkit/glue/plugins/webplugin_delegate_impl.h" diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h index 03710f3..56b90f6 100644 --- a/chrome/renderer/render_view.h +++ b/chrome/renderer/render_view.h @@ -9,11 +9,13 @@ #include <vector> #include "base/basictypes.h" +#include "base/scoped_handle.h" #include "base/gfx/point.h" #include "base/gfx/rect.h" #include "base/timer.h" #include "base/values.h" #include "build/build_config.h" +#include "chrome/common/page_zoom.h" #include "chrome/common/resource_dispatcher.h" #ifdef CHROME_PERSONALIZATION #include "chrome/personalization/personalization.h" @@ -22,13 +24,17 @@ #include "chrome/renderer/dom_ui_bindings.h" #include "chrome/renderer/external_host_bindings.h" #include "chrome/renderer/external_js_object.h" +#include "chrome/renderer/render_process.h" #include "chrome/renderer/render_widget.h" #include "testing/gtest/include/gtest/gtest_prod.h" #include "webkit/glue/console_message_level.h" #include "webkit/glue/dom_serializer_delegate.h" +#include "webkit/glue/find_in_page_request.h" #include "webkit/glue/form_data.h" +#include "webkit/glue/glue_accessibility.h" #include "webkit/glue/password_form_dom_manager.h" #include "webkit/glue/webview_delegate.h" +#include "webkit/glue/weburlrequest.h" #include "webkit/glue/webview.h" #if defined(OS_WIN) @@ -38,13 +44,9 @@ #pragma warning(disable: 4250) #endif -class DictionaryValue; class DebugMessageHandler; -class FilePath; -class GlueAccessibility; class GURL; class RenderThread; -class ResourceDispatcher; class SkBitmap; class WebError; class WebFrame; @@ -52,7 +54,6 @@ class WebPluginDelegate; class WebPluginDelegateProxy; struct AccessibilityInParams; struct AccessibilityOutParams; -struct FindInPageRequest; struct ThumbnailScore; struct ViewMsg_Navigate_Params; struct ViewMsg_PrintPage_Params; diff --git a/chrome/renderer/render_widget.h b/chrome/renderer/render_widget.h index d4d92c4..8e37b83 100644 --- a/chrome/renderer/render_widget.h +++ b/chrome/renderer/render_widget.h @@ -18,9 +18,9 @@ #include "webkit/glue/webwidget_delegate.h" #include "webkit/glue/webcursor.h" +#include "webkit/glue/webplugin.h" class RenderThreadBase; -struct WebPluginGeometry; // RenderWidget provides a communication bridge between a WebWidget and // a RenderWidgetHost, the latter of which lives in a different process. diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc index 02ab239..fa2a87a 100644 --- a/chrome/renderer/renderer_glue.cc +++ b/chrome/renderer/renderer_glue.cc @@ -14,13 +14,11 @@ #include "base/clipboard.h" #include "base/scoped_clipboard_writer.h" #include "base/string_util.h" +#include "chrome/renderer/net/render_dns_master.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/render_messages.h" #include "chrome/common/resource_bundle.h" +#include "chrome/common/render_messages.h" #include "chrome/plugin/npobject_util.h" -#include "chrome/renderer/net/render_dns_master.h" -#include "chrome/renderer/render_process.h" -#include "chrome/renderer/render_thread.h" #include "chrome/renderer/render_view.h" #include "chrome/renderer/visitedlink_slave.h" #include "googleurl/src/url_util.h" @@ -382,3 +380,4 @@ void NotifyCacheStats() { #endif // !USING_SIMPLE_RESOURCE_LOADER_BRIDGE } // namespace webkit_glue + diff --git a/chrome/renderer/user_script_slave.cc b/chrome/renderer/user_script_slave.cc index 0e64a17..9db7e68 100644 --- a/chrome/renderer/user_script_slave.cc +++ b/chrome/renderer/user_script_slave.cc @@ -10,7 +10,6 @@ #include "chrome/common/resource_bundle.h" #include "chrome/renderer/renderer_resources.h" #include "googleurl/src/gurl.h" -#include "webkit/glue/webframe.h" // These two strings are injected before and after the Greasemonkey API and // user script to wrap it in an anonymous scope. diff --git a/chrome/renderer/user_script_slave.h b/chrome/renderer/user_script_slave.h index eeb34ae..3958b19 100644 --- a/chrome/renderer/user_script_slave.h +++ b/chrome/renderer/user_script_slave.h @@ -11,10 +11,12 @@ #include "base/scoped_ptr.h" #include "base/shared_memory.h" #include "base/string_piece.h" +#include "base/string_util.h" #include "chrome/common/extensions/user_script.h" #include "chrome/common/stl_util-inl.h" +#include "testing/gtest/include/gtest/gtest_prod.h" +#include "webkit/glue/webframe.h" -class WebFrame; // Manages installed UserScripts for a render process. class UserScriptSlave { diff --git a/chrome/renderer/webmediaplayer_delegate_impl.h b/chrome/renderer/webmediaplayer_delegate_impl.h index e050e98..7e62b16 100644 --- a/chrome/renderer/webmediaplayer_delegate_impl.h +++ b/chrome/renderer/webmediaplayer_delegate_impl.h @@ -44,6 +44,7 @@ #include "base/lock.h" #include "base/message_loop.h" +#include "media/base/factory.h" #include "media/base/filters.h" #include "media/base/pipeline_impl.h" #include "webkit/glue/webmediaplayer_delegate.h" @@ -51,10 +52,6 @@ class RenderView; class VideoRendererImpl; -namespace media { -class FilterFactoryCollection; -} - // This typedef is used for WebMediaPlayerDelegateImpl::PostTask() and // NotifyWebMediaPlayerTask in the source file. typedef void (webkit_glue::WebMediaPlayer::*WebMediaPlayerMethod)(); diff --git a/chrome/renderer/webplugin_delegate_proxy.h b/chrome/renderer/webplugin_delegate_proxy.h index 3b7c978..20ef94f 100644 --- a/chrome/renderer/webplugin_delegate_proxy.h +++ b/chrome/renderer/webplugin_delegate_proxy.h @@ -5,19 +5,21 @@ #ifndef CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H__ #define CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H__ +#include <set> #include <string> #include "base/gfx/rect.h" #include "base/gfx/native_widget_types.h" #include "base/ref_counted.h" +#include "base/scoped_handle.h" #include "chrome/common/ipc_message.h" +#include "chrome/plugin/npobject_stub.h" #include "chrome/renderer/plugin_channel_host.h" #include "webkit/glue/webplugin.h" #include "webkit/glue/webplugin_delegate.h" class GURL; struct PluginHostMsg_URLRequest_Params; -class NPObjectStub; class RenderView; class SkBitmap; |