Revert 47726 (turned nacl_ui_tests red) - Mac: First steps for default plugin...

webkit/default_plugin/plugin_impl_win.cc

 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/default_plugin/plugin_impl_win.h"
 
 #include <shellapi.h>
 
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 34 matching lines @@
   if (underline_font_)
     DeleteObject(underline_font_);
 
   if (tooltip_)
     DestroyWindow(tooltip_);
 }
 
 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);
 
   if (mime_type == NULL || strlen(mime_type) == 0) {
     DLOG(WARNING) << __FUNCTION__ << " Invalid parameters passed in";
     NOTREACHED();
     return false;
   }
 
   instance_ = instance;
@@ skipping 214 matching lines @@
   if (replacement_string.empty()) {
     return webkit_glue::GetLocalizedString(messsage_id_without_placeholders);
   } else {
     std::wstring string_with_placeholders =
         webkit_glue::GetLocalizedString(message_id_with_placeholders);
     return ReplaceStringPlaceholders(string_with_placeholders,
                                      replacement_string, NULL);
   }
 }
 
-bool PluginInstallerImpl::NPP_SetWindow(NPWindow* window_info) {
-  HWND parent_window = reinterpret_cast<HWND>(window_info->window);
+bool PluginInstallerImpl::SetWindow(HWND parent_window) {
   if (!IsWindow(parent_window)) {
     // No window created yet. Ignore this call.
     if (!IsWindow(hwnd()))
       return true;
     // Parent window has been destroyed.
     Shutdown();
     return true;
   }
 
   RECT parent_rect = {0};
@@ skipping 336 matching lines @@
   return true;
 }
 
 void PluginInstallerImpl::NotifyPluginStatus(int status) {
   default_plugin::g_browser->getvalue(
     instance_,
     static_cast<NPNVariable>(
         default_plugin::kMissingPluginStatusStart + status),
     NULL);
 }