Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(312)

Unified Diff: webkit/default_plugin/plugin_impl_win.h

Issue 42684: It looks like the Chrome NPAPI plugin installer has been broken since we firs... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/plugin/plugin_test.cpp ('k') | webkit/default_plugin/plugin_impl_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/default_plugin/plugin_impl_win.h
===================================================================
--- webkit/default_plugin/plugin_impl_win.h (revision 12720)
+++ webkit/default_plugin/plugin_impl_win.h (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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.
@@ -191,6 +191,41 @@
// Arabic).
bool IsRTLLayout() const;
+ // Parses the plugin instantiation arguments. This includes checking for
+ // whether this is an activex install and reading the appropriate
+ // arguments like codebase, etc. For plugin installs we download the
+ // plugin finder URL and initalize the mime type and the plugin instance
+ // info.
+ //
+ // Parameters:
+ // module_handle: The handle to the dll in which this object is instantiated.
+ // instance: The plugins opaque instance handle.
+ // mime_type: Identifies the third party plugin
+ // argc: Indicates the count of arguments passed in from the webpage.
+ // argv: Pointer to the arguments.
+ // raw_activex_clsid: Output parameter which contains the CLSID of the
+ // Activex plugin needed for an Activex install
+ // is_activex: Output parameter indicating if this is an activex install
+ // activex_clsid: Output parameter containing the classid of the activex
+ // for an activex install
+ // activex_codebase: Output parameter containing the activex codebase if
+ // this is an activex install
+ // plugin_download_url: Output parameter containing the plugin download url
+ // on success.
+ // plugin_finder_url: Output parameter containing the plugin finder url on
+ // success.
+ // Returns true on success.
+ static bool ParseInstantiationArguments(NPMIMEType mime_type,
+ NPP instance,
+ int16 argc,
+ char* argn[],
+ char* argv[],
+ std::string* raw_activex_clsid,
+ bool* is_activex,
+ std::string* activex_clsid,
+ std::string* activex_codebase,
+ std::string* plugin_download_url,
+ std::string* plugin_finder_url);
protected:
// Window message handlers.
LRESULT OnPaint(UINT message, WPARAM wparam, LPARAM lparam, BOOL& handled);
@@ -254,7 +289,7 @@
// relative_url
// The URL to be resolved.
// Returns the resolved URL.
- std::string ResolveURL(NPP instance, const std::string& relative_url);
+ static std::string ResolveURL(NPP instance, const std::string& relative_url);
// Initializes resources like the icon, fonts, etc needed by the plugin
// installer
@@ -265,32 +300,6 @@
// Returns true on success.
bool InitializeResources(HINSTANCE module_handle);
- // Parses the plugin instantiation arguments. This includes checking for
- // whether this is an activex install and reading the appropriate
- // arguments like codebase, etc. For plugin installs we download the
- // plugin finder URL and initalize the mime type and the plugin instance
- // info.
- //
- // Parameters:
- // module_handle
- // The handle to the dll in which this object is instantiated.
- // instance
- // The plugins opaque instance handle.
- // mime_type
- // Identifies the third party plugin which would be eventually installed.
- // argc
- // Indicates the count of arguments passed in from the webpage.
- // argv
- // Pointer to the arguments.
- // raw_activex_clsid
- // Output parameter which contains the CLSID of the Activex plugin needed.
- // This is only applicable if the webpage specifically requests an ActiveX
- // control.
- // Returns true on success.
- bool ParseInstantiationArguments(NPMIMEType mime_type, NPP instance,
- int16 argc, char* argn[], char* argv[],
- std::string* raw_activex_clsid);
-
// Paints user action messages to the plugin window. These include messages
// like whether the user should click on the plugin window to download the
// plugin, etc.
« no previous file with comments | « chrome/test/plugin/plugin_test.cpp ('k') | webkit/default_plugin/plugin_impl_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698