| Index: webkit/default_plugin/plugin_impl_win.cc
|
| diff --git a/webkit/default_plugin/plugin_impl_win.cc b/webkit/default_plugin/plugin_impl_win.cc
|
| index 2a62a1cdd661e672d1e6276bc05dcc079e3102d0..49202402366ed88903c1d11b17da2625c33ecaea 100644
|
| --- a/webkit/default_plugin/plugin_impl_win.cc
|
| +++ b/webkit/default_plugin/plugin_impl_win.cc
|
| @@ -52,7 +52,7 @@ PluginInstallerImpl::~PluginInstallerImpl() {
|
| bool PluginInstallerImpl::Initialize(HINSTANCE module_handle, NPP instance,
|
| NPMIMEType mime_type, int16 argc,
|
| char* argn[], char* argv[]) {
|
| - DLOG(INFO) << __FUNCTION__ << " Mime Type : " << mime_type;
|
| + DLOG(INFO) << __FUNCTION__ << " MIME Type : " << mime_type;
|
| DCHECK(instance != NULL);
|
| DCHECK(module_handle != NULL);
|
|
|
| @@ -287,7 +287,8 @@ std::wstring PluginInstallerImpl::ReplaceStringForPossibleEmptyReplacement(
|
| }
|
| }
|
|
|
| -bool PluginInstallerImpl::SetWindow(HWND parent_window) {
|
| +bool PluginInstallerImpl::NPP_SetWindow(NPWindow* window_info) {
|
| + HWND parent_window = reinterpret_cast<HWND>(window_info->window);
|
| if (!IsWindow(parent_window)) {
|
| // No window created yet. Ignore this call.
|
| if (!IsWindow(hwnd()))
|
|
|