| Index: chrome/browser/renderer_host/resource_message_filter.h
|
| diff --git a/chrome/browser/renderer_host/resource_message_filter.h b/chrome/browser/renderer_host/resource_message_filter.h
|
| index 19566be5453f2b48ce227aab942643f93ca02bb9..1ce2b9579ebffaf3b1027999805ad4c79e08c01a 100644
|
| --- a/chrome/browser/renderer_host/resource_message_filter.h
|
| +++ b/chrome/browser/renderer_host/resource_message_filter.h
|
| @@ -125,8 +125,7 @@ class ResourceMessageFilter : public IPC::ChannelProxy::MessageFilter,
|
| void OnLoadFont(LOGFONT font);
|
| #endif
|
|
|
| - void OnGetScreenInfo(gfx::NativeViewId window,
|
| - WebKit::WebScreenInfo* results);
|
| + void OnGetScreenInfo(gfx::NativeViewId window, IPC::Message* reply);
|
| void OnGetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins);
|
| void OnGetPluginPath(const GURL& url,
|
| const std::string& mime_type,
|
| @@ -156,8 +155,8 @@ class ResourceMessageFilter : public IPC::ChannelProxy::MessageFilter,
|
| void OnClipboardReadText(string16* result);
|
| void OnClipboardReadAsciiText(std::string* result);
|
| void OnClipboardReadHTML(string16* markup, GURL* src_url);
|
| - void OnGetWindowRect(gfx::NativeViewId window, gfx::Rect *rect);
|
| - void OnGetRootWindowRect(gfx::NativeViewId window, gfx::Rect *rect);
|
| + void OnGetWindowRect(gfx::NativeViewId window, IPC::Message* reply);
|
| + void OnGetRootWindowRect(gfx::NativeViewId window, IPC::Message* reply);
|
| void OnGetMimeTypeFromExtension(const FilePath::StringType& ext,
|
| std::string* mime_type);
|
| void OnGetMimeTypeFromFile(const FilePath& file_path,
|
| @@ -203,6 +202,13 @@ class ResourceMessageFilter : public IPC::ChannelProxy::MessageFilter,
|
| void OnOpenChannelToExtension(const std::string& extension_id, int* port_id);
|
| void OnExtensionPostMessage(int port_id, const std::string& message);
|
|
|
| +#if defined(OS_LINUX)
|
| + void SendBackgroundX11Reply(IPC::Message* reply_msg);
|
| + void DoOnGetScreenInfo(gfx::NativeViewId view, IPC::Message* reply_msg);
|
| + void DoOnGetWindowRect(gfx::NativeViewId view, IPC::Message* reply_msg);
|
| + void DoOnGetRootWindowRect(gfx::NativeViewId view, IPC::Message* reply_msg);
|
| +#endif
|
| +
|
| // We have our own clipboard service because we want to access the clipboard
|
| // on the IO thread instead of forwarding (possibly synchronous) messages to
|
| // the UI thread.
|
|
|