diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-01 01:24:34 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-01 01:24:34 +0000 |
commit | d344114ca44ce687708279e8ab11ddce6f825248 (patch) | |
tree | 8064f82bcd0a0b0c7e3d5d6a96a6c4e7d6f341e1 | |
parent | 62c1f7a4f16a4c3810d73f3e367934bfe99cd6fb (diff) | |
download | chromium_src-d344114ca44ce687708279e8ab11ddce6f825248.zip chromium_src-d344114ca44ce687708279e8ab11ddce6f825248.tar.gz chromium_src-d344114ca44ce687708279e8ab11ddce6f825248.tar.bz2 |
Start off the Content API by moving content::ContentRendererClient to content\public\renderer.
BUG=98716
Review URL: http://codereview.chromium.org/8100013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103609 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/renderer/DEPS | 1 | ||||
-rw-r--r-- | chrome/renderer/chrome_content_renderer_client.h | 2 | ||||
-rw-r--r-- | chrome/renderer/chrome_render_view_observer.cc | 2 | ||||
-rw-r--r-- | content/app/OWNERS | 4 | ||||
-rw-r--r-- | content/content_renderer.gypi | 1 | ||||
-rw-r--r-- | content/public/OWNERS | 2 | ||||
-rw-r--r-- | content/public/renderer/content_renderer_client.h (renamed from content/renderer/content_renderer_client.h) | 6 | ||||
-rw-r--r-- | content/renderer/DEPS | 2 | ||||
-rw-r--r-- | content/renderer/mock_content_renderer_client.h | 2 | ||||
-rw-r--r-- | content/renderer/pepper_plugin_delegate_impl.cc | 2 | ||||
-rw-r--r-- | content/renderer/render_process_impl.cc | 2 | ||||
-rw-r--r-- | content/renderer/render_thread.cc | 2 | ||||
-rw-r--r-- | content/renderer/render_view.cc | 2 | ||||
-rw-r--r-- | content/renderer/renderer_glue.cc | 2 | ||||
-rw-r--r-- | content/renderer/renderer_webcookiejar_impl.cc | 2 | ||||
-rw-r--r-- | content/renderer/renderer_webkitplatformsupport_impl.cc | 2 | ||||
-rw-r--r-- | content/renderer/webplugin_delegate_proxy.cc | 2 | ||||
-rw-r--r-- | content/shell/shell_content_renderer_client.h | 2 |
18 files changed, 24 insertions, 16 deletions
diff --git a/chrome/renderer/DEPS b/chrome/renderer/DEPS index 4a1d8f2..c7fd3e0 100644 --- a/chrome/renderer/DEPS +++ b/chrome/renderer/DEPS @@ -1,5 +1,6 @@ include_rules = [ "+chrome/app", # The plugins use the theme library to get the sad plugin bitmap. + "+content/public/renderer", "+content/renderer", "+grit", # For generated headers "+media/base", # For initializing media library and media switches. diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h index 3cb1d4e..7931318 100644 --- a/chrome/renderer/chrome_content_renderer_client.h +++ b/chrome/renderer/chrome_content_renderer_client.h @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "content/renderer/content_renderer_client.h" +#include "content/public/renderer/content_renderer_client.h" class ChromeRenderProcessObserver; class ExtensionDispatcher; diff --git a/chrome/renderer/chrome_render_view_observer.cc b/chrome/renderer/chrome_render_view_observer.cc index f4648fbc..4016919 100644 --- a/chrome/renderer/chrome_render_view_observer.cc +++ b/chrome/renderer/chrome_render_view_observer.cc @@ -26,7 +26,7 @@ #include "chrome/renderer/translate_helper.h" #include "content/common/bindings_policy.h" #include "content/common/view_messages.h" -#include "content/renderer/content_renderer_client.h" +#include "content/public/renderer/content_renderer_client.h" #include "net/base/data_url.h" #include "skia/ext/image_operations.h" #include "skia/ext/platform_canvas.h" diff --git a/content/app/OWNERS b/content/app/OWNERS new file mode 100644 index 0000000..da46991 --- /dev/null +++ b/content/app/OWNERS @@ -0,0 +1,4 @@ +set noparent +agl@chromium.org +evan@chromium.org +jam@chromium.org diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi index 7d702a5..8bf3a1c 100644 --- a/content/content_renderer.gypi +++ b/content/content_renderer.gypi @@ -23,6 +23,7 @@ '..', ], 'sources': [ + 'public/renderer/content_renderer_client.h', 'renderer/active_notification_tracker.cc', 'renderer/active_notification_tracker.h', 'renderer/content_renderer_client.h', diff --git a/content/public/OWNERS b/content/public/OWNERS new file mode 100644 index 0000000..c28abe3 --- /dev/null +++ b/content/public/OWNERS @@ -0,0 +1,2 @@ +set noparent +jam@chromium.org diff --git a/content/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h index 1079a26..3ed428b 100644 --- a/content/renderer/content_renderer_client.h +++ b/content/public/renderer/content_renderer_client.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_RENDERER_CONTENT_RENDERER_CLIENT_H_ -#define CONTENT_RENDERER_CONTENT_RENDERER_CLIENT_H_ +#ifndef CONTENT_PUBLIC_RENDERER_CONTENT_RENDERER_CLIENT_H_ +#define CONTENT_PUBLIC_RENDERER_CONTENT_RENDERER_CLIENT_H_ #pragma once #include <string> @@ -134,4 +134,4 @@ class ContentRendererClient { } // namespace content -#endif // CONTENT_RENDERER_CONTENT_RENDERER_CLIENT_H_ +#endif // CONTENT_PUBLIC_RENDERER_CONTENT_RENDERER_CLIENT_H_ diff --git a/content/renderer/DEPS b/content/renderer/DEPS index ccb1fad..808c536 100644 --- a/content/renderer/DEPS +++ b/content/renderer/DEPS @@ -1,6 +1,6 @@ include_rules = [ - "-chrome", "+chrome/test", + "+content/public/renderer", "+media", # For audio input/output and audio/video decoding. "+third_party/mach_override", "+third_party/tcmalloc", diff --git a/content/renderer/mock_content_renderer_client.h b/content/renderer/mock_content_renderer_client.h index bf3155d..ea25c4f 100644 --- a/content/renderer/mock_content_renderer_client.h +++ b/content/renderer/mock_content_renderer_client.h @@ -9,7 +9,7 @@ #include <string> #include "base/compiler_specific.h" -#include "content/renderer/content_renderer_client.h" +#include "content/public/renderer/content_renderer_client.h" namespace content { diff --git a/content/renderer/pepper_plugin_delegate_impl.cc b/content/renderer/pepper_plugin_delegate_impl.cc index 6e24e97..3ea66d2 100644 --- a/content/renderer/pepper_plugin_delegate_impl.cc +++ b/content/renderer/pepper_plugin_delegate_impl.cc @@ -29,7 +29,7 @@ #include "content/common/pepper_messages.h" #include "content/common/quota_dispatcher.h" #include "content/common/view_messages.h" -#include "content/renderer/content_renderer_client.h" +#include "content/public/renderer/content_renderer_client.h" #include "content/renderer/gpu/command_buffer_proxy.h" #include "content/renderer/gpu/gpu_channel_host.h" #include "content/renderer/gpu/renderer_gl_context.h" diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc index c5df75c..bff576b 100644 --- a/content/renderer/render_process_impl.cc +++ b/content/renderer/render_process_impl.cc @@ -20,7 +20,7 @@ #include "base/utf_string_conversions.h" #include "content/common/content_switches.h" #include "content/common/view_messages.h" -#include "content/renderer/content_renderer_client.h" +#include "content/public/renderer/content_renderer_client.h" #include "content/renderer/render_thread.h" #include "content/renderer/render_view.h" #include "ipc/ipc_channel.h" diff --git a/content/renderer/render_thread.cc b/content/renderer/render_thread.cc index 53332b9..77cae07 100644 --- a/content/renderer/render_thread.cc +++ b/content/renderer/render_thread.cc @@ -33,7 +33,7 @@ #include "content/common/resource_messages.h" #include "content/common/view_messages.h" #include "content/common/web_database_observer_impl.h" -#include "content/renderer/content_renderer_client.h" +#include "content/public/renderer/content_renderer_client.h" #include "content/renderer/devtools_agent_filter.h" #include "content/renderer/gpu/gpu_channel_host.h" #include "content/renderer/indexed_db_dispatcher.h" diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc index 333bdeb..8d08fab 100644 --- a/content/renderer/render_view.cc +++ b/content/renderer/render_view.cc @@ -41,7 +41,7 @@ #include "content/common/request_extra_data.h" #include "content/common/url_constants.h" #include "content/common/view_messages.h" -#include "content/renderer/content_renderer_client.h" +#include "content/public/renderer/content_renderer_client.h" #include "content/renderer/device_orientation_dispatcher.h" #include "content/renderer/devtools_agent.h" #include "content/renderer/external_popup_menu.h" diff --git a/content/renderer/renderer_glue.cc b/content/renderer/renderer_glue.cc index 7677bd4..d03150b 100644 --- a/content/renderer/renderer_glue.cc +++ b/content/renderer/renderer_glue.cc @@ -23,7 +23,7 @@ #include "content/common/socket_stream_dispatcher.h" #include "content/common/url_constants.h" #include "content/common/view_messages.h" -#include "content/renderer/content_renderer_client.h" +#include "content/public/renderer/content_renderer_client.h" #include "content/renderer/render_thread.h" #include "googleurl/src/url_util.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" diff --git a/content/renderer/renderer_webcookiejar_impl.cc b/content/renderer/renderer_webcookiejar_impl.cc index 53cec96..01ec6cf 100644 --- a/content/renderer/renderer_webcookiejar_impl.cc +++ b/content/renderer/renderer_webcookiejar_impl.cc @@ -6,7 +6,7 @@ #include "base/utf_string_conversions.h" #include "content/common/view_messages.h" -#include "content/renderer/content_renderer_client.h" +#include "content/public/renderer/content_renderer_client.h" #include "content/renderer/render_thread.h" #include "content/renderer/render_view.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCookie.h" diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc index 67ab3aa..7800c08 100644 --- a/content/renderer/renderer_webkitplatformsupport_impl.cc +++ b/content/renderer/renderer_webkitplatformsupport_impl.cc @@ -19,7 +19,7 @@ #include "content/common/view_messages.h" #include "content/common/webblobregistry_impl.h" #include "content/common/webmessageportchannel_impl.h" -#include "content/renderer/content_renderer_client.h" +#include "content/public/renderer/content_renderer_client.h" #include "content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h" #include "content/renderer/media/audio_device.h" #include "content/renderer/render_thread.h" diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc index 1caf3ee..0f84f1b 100644 --- a/content/renderer/webplugin_delegate_proxy.cc +++ b/content/renderer/webplugin_delegate_proxy.cc @@ -28,8 +28,8 @@ #include "content/common/npobject_util.h" #include "content/common/plugin_messages.h" #include "content/common/view_messages.h" +#include "content/public/renderer/content_renderer_client.h" #include "content/renderer/gpu/command_buffer_proxy.h" -#include "content/renderer/content_renderer_client.h" #include "content/renderer/plugin_channel_host.h" #include "content/renderer/render_thread.h" #include "content/renderer/render_view.h" diff --git a/content/shell/shell_content_renderer_client.h b/content/shell/shell_content_renderer_client.h index c2cc8fe..05449ee 100644 --- a/content/shell/shell_content_renderer_client.h +++ b/content/shell/shell_content_renderer_client.h @@ -7,7 +7,7 @@ #pragma once #include "base/compiler_specific.h" -#include "content/renderer/content_renderer_client.h" +#include "content/public/renderer/content_renderer_client.h" namespace content { |