diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-19 21:55:10 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-19 21:55:10 +0000 |
| commit | de49ea10c04eb354ab0187b8f98898c272660037 (patch) | |
| tree | f40b45b18318d1852fc23dd9f521e766150a476b /webkit/default_plugin/plugin_impl_win.cc | |
| parent | 12c342cca520241c8a221d26d40f861a0eba4d51 (diff) | |
| download | chromium_src-de49ea10c04eb354ab0187b8f98898c272660037.zip chromium_src-de49ea10c04eb354ab0187b8f98898c272660037.tar.gz chromium_src-de49ea10c04eb354ab0187b8f98898c272660037.tar.bz2 | |
Revert 47726 (turned nacl_ui_tests red) - Mac: First steps for default plugin
BUG=17392
TEST=Go to http://www.adobe.com/shockwave/welcome/. The task manager should show that the default plugin is running, and the "Missing Plugin" text should look slightly different than it did before. (this test depends on a small webkit patch)
Requires commenting out
if (objectContentType(url, mimeType) != ObjectContentNetscapePlugin)
return 0;
in WebKit/WebKit/chromium/src/FrameLoaderClientImpl.cpp's createPlugin() as well, else the default plugin won't load.
Review URL: http://codereview.chromium.org/2075006
TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/2132018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47730 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/default_plugin/plugin_impl_win.cc')
| -rw-r--r-- | webkit/default_plugin/plugin_impl_win.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/webkit/default_plugin/plugin_impl_win.cc b/webkit/default_plugin/plugin_impl_win.cc index 4920240..2a62a1c 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,8 +287,7 @@ std::wstring PluginInstallerImpl::ReplaceStringForPossibleEmptyReplacement( } } -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())) |