| Index: chrome/browser/resource_message_filter.h
|
| diff --git a/chrome/browser/resource_message_filter.h b/chrome/browser/resource_message_filter.h
|
| index 09d42b67ed3c137490ddca64ec7c6743ab045573..026c232c83e670fc12a22a7a49fc090a1e1b662e 100644
|
| --- a/chrome/browser/resource_message_filter.h
|
| +++ b/chrome/browser/resource_message_filter.h
|
| @@ -82,7 +82,7 @@ class ResourceMessageFilter : public IPC::ChannelProxy::MessageFilter,
|
|
|
| private:
|
| void OnMsgCreateWindow(int opener_id, bool user_gesture, int* route_id,
|
| - HANDLE* modal_dialog_event);
|
| + ModalDialogEvent* modal_dialog_event);
|
| void OnMsgCreateWidget(int opener_id, bool activatable, int* route_id);
|
| void OnRequestResource(const IPC::Message& msg, int request_id,
|
| const ViewHostMsg_Resource_Request& request);
|
| @@ -115,7 +115,7 @@ class ResourceMessageFilter : public IPC::ChannelProxy::MessageFilter,
|
| void OnLoadFont(LOGFONT font);
|
| #endif
|
|
|
| - void OnGetScreenInfo(gfx::NativeView window,
|
| + void OnGetScreenInfo(gfx::NativeViewId window,
|
| webkit_glue::ScreenInfo* results);
|
| void OnGetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins);
|
| void OnGetPluginPath(const GURL& url,
|
| @@ -142,9 +142,9 @@ class ResourceMessageFilter : public IPC::ChannelProxy::MessageFilter,
|
| void OnClipboardReadAsciiText(std::string* result);
|
| void OnClipboardReadHTML(std::wstring* markup, GURL* src_url);
|
| #if defined(OS_WIN)
|
| - void OnGetWindowRect(HWND window, gfx::Rect *rect);
|
| - void OnGetRootWindowRect(HWND window, gfx::Rect *rect);
|
| - void OnGetRootWindowResizerRect(HWND window, gfx::Rect *rect);
|
| + void OnGetWindowRect(gfx::NativeViewId window, gfx::Rect *rect);
|
| + void OnGetRootWindowRect(gfx::NativeViewId window, gfx::Rect *rect);
|
| + void OnGetRootWindowResizerRect(gfx::NativeViewId window, gfx::Rect *rect);
|
| #endif
|
| void OnGetMimeTypeFromExtension(const std::wstring& ext,
|
| std::string* mime_type);
|
| @@ -168,7 +168,7 @@ class ResourceMessageFilter : public IPC::ChannelProxy::MessageFilter,
|
| // A javascript code requested to print the current page. The renderer host
|
| // have to show to the user the print dialog and returns the selected print
|
| // settings.
|
| - void OnScriptedPrint(HWND host_window,
|
| + void OnScriptedPrint(gfx::NativeViewId host_window,
|
| int cookie,
|
| int expected_pages_count,
|
| IPC::Message* reply_msg);
|
|
|