| Index: content/renderer/renderer_glue.cc
|
| diff --git a/content/renderer/renderer_glue.cc b/content/renderer/renderer_glue.cc
|
| index 3b3f01aebe4586312e950f8a8c31001f6649c8cd..f36ce2cba31d0d3efc8a6e42e4ddece26e4e146f 100644
|
| --- a/content/renderer/renderer_glue.cc
|
| +++ b/content/renderer/renderer_glue.cc
|
| @@ -12,28 +12,15 @@
|
|
|
| #include <vector>
|
|
|
| -#include "base/command_line.h"
|
| -#include "base/memory/ref_counted.h"
|
| #include "base/shared_memory.h"
|
| -#include "base/string_util.h"
|
| #include "content/common/clipboard_messages.h"
|
| -#include "content/common/npobject_util.h"
|
| -#include "content/common/socket_stream_dispatcher.h"
|
| -#include "content/common/view_messages.h"
|
| -#include "content/public/common/content_switches.h"
|
| #include "content/public/common/url_constants.h"
|
| #include "content/public/renderer/content_renderer_client.h"
|
| #include "content/renderer/render_thread_impl.h"
|
| -#include "googleurl/src/url_util.h"
|
| -#include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
|
| -#include "third_party/WebKit/Source/WebKit/chromium/public/WebKitPlatformSupport.h"
|
| -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
|
| -#include "third_party/skia/include/core/SkBitmap.h"
|
| #include "ui/base/clipboard/clipboard.h"
|
| -#include "ui/base/ui_base_switches.h"
|
| +#include "ui/gfx/size.h"
|
| #include "webkit/glue/scoped_clipboard_writer_glue.h"
|
| #include "webkit/glue/webkit_glue.h"
|
| -#include "webkit/glue/websocketstreamhandle_bridge.h"
|
|
|
| // This definition of WriteBitmapFromPixels uses shared memory to communicate
|
| // across processes.
|
| @@ -149,14 +136,6 @@ void ClipboardReadImage(ui::Clipboard::Buffer buffer, std::string* data) {
|
| }
|
| }
|
|
|
| -void GetPlugins(bool refresh,
|
| - std::vector<webkit::WebPluginInfo>* plugins) {
|
| - if (!RenderThreadImpl::current()->plugin_refresh_allowed())
|
| - refresh = false;
|
| - RenderThreadImpl::current()->Send(
|
| - new ViewHostMsg_GetPlugins(refresh, plugins));
|
| -}
|
| -
|
| bool IsProtocolSupportedForMedia(const GURL& url) {
|
| // If new protocol is to be added here, we need to make sure the response is
|
| // validated accordingly in the media engine.
|
| @@ -170,27 +149,4 @@ bool IsProtocolSupportedForMedia(const GURL& url) {
|
| content::GetContentClient()->renderer()->IsProtocolSupportedForMedia(url);
|
| }
|
|
|
| -// static factory function
|
| -ResourceLoaderBridge* ResourceLoaderBridge::Create(
|
| - const ResourceLoaderBridge::RequestInfo& request_info) {
|
| - return ChildThread::current()->CreateBridge(request_info);
|
| -}
|
| -
|
| -// static factory function
|
| -WebSocketStreamHandleBridge* WebSocketStreamHandleBridge::Create(
|
| - WebKit::WebSocketStreamHandle* handle,
|
| - WebSocketStreamHandleDelegate* delegate) {
|
| - SocketStreamDispatcher* dispatcher =
|
| - ChildThread::current()->socket_stream_dispatcher();
|
| - return dispatcher->CreateBridge(handle, delegate);
|
| -}
|
| -
|
| -string16 GetLocalizedString(int message_id) {
|
| - return content::GetContentClient()->GetLocalizedString(message_id);
|
| -}
|
| -
|
| -base::StringPiece GetDataResource(int resource_id) {
|
| - return content::GetContentClient()->GetDataResource(resource_id);
|
| -}
|
| -
|
| } // namespace webkit_glue
|
|
|