diff options
author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 12:46:38 +0000 |
---|---|---|
committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 12:46:38 +0000 |
commit | f0a51fb571f46531025fa09240bbc3e1af925e84 (patch) | |
tree | 558b4f0e737fda4b9ab60f252c9c23b8a4ca523e /webkit/activex_shim | |
parent | 6390be368205705f49ead3cec40396519f13b889 (diff) | |
download | chromium_src-f0a51fb571f46531025fa09240bbc3e1af925e84.zip chromium_src-f0a51fb571f46531025fa09240bbc3e1af925e84.tar.gz chromium_src-f0a51fb571f46531025fa09240bbc3e1af925e84.tar.bz2 |
Fixes CRLF and trailing white spaces.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/activex_shim')
-rw-r--r-- | webkit/activex_shim/activex_plugin.h | 2 | ||||
-rw-r--r-- | webkit/activex_shim/activex_shared.cc | 10 | ||||
-rw-r--r-- | webkit/activex_shim/activex_util.cc | 2 | ||||
-rw-r--r-- | webkit/activex_shim/web_activex_site.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/webkit/activex_shim/activex_plugin.h b/webkit/activex_shim/activex_plugin.h index 9c3d3de..2053c5d 100644 --- a/webkit/activex_shim/activex_plugin.h +++ b/webkit/activex_shim/activex_plugin.h @@ -57,7 +57,7 @@ class ActiveXPlugin : public DispatchObject { private: // Process parameters passed in from browser. void ProcessParams(int16 argc, char* argn[], char* argv[]); - // For handling wmp mime type, we need to initialize params differently + // For handling wmp mime type, we need to initialize params differently // (change src to corresponding param for wmp control), and set clsid to wmp. void ConvertForEmbeddedWmp(); diff --git a/webkit/activex_shim/activex_shared.cc b/webkit/activex_shim/activex_shared.cc index ee146b9..965429bc 100644 --- a/webkit/activex_shim/activex_shared.cc +++ b/webkit/activex_shim/activex_shared.cc @@ -23,8 +23,8 @@ struct ActiveXAttribute { // - "*" will match any sites. // - "file" matches file url starts with "file://" // - anything else matches the last part of the host. - // e.g. "95559.com;ecitic.com" allows controls running from 95559.com and - // ecitic.com. + // e.g. "95559.com;ecitic.com" allows controls running from 95559.com and + // ecitic.com. // See MatchUrlForSinglePattern for details. const char* allowed_sites; const char* allowed_codebase_sites; @@ -117,7 +117,7 @@ bool IsCodebaseAllowed(const std::string& clsid, const std::string& codebase) { return false; if (attr->allowed_codebase_sites == NULL) return false; - return MatchUrlForPatterns(url, attr->allowed_codebase_sites); + return MatchUrlForPatterns(url, attr->allowed_codebase_sites); } bool GetClsidFromClassidAttribute(const std::string& classid, @@ -137,7 +137,7 @@ std::string GetVersionFromCodebaseAttribute(const std::string& codebase) { std::string version; size_t pos = codebase.find('#'); if (pos == std::string::npos) - return version; + return version; std::string rest = codebase.substr(pos + 1); std::string version_prefix = "version="; if (!StartsWithASCII(rest, "version=", false)) @@ -188,7 +188,7 @@ bool IsActiveXInstalled(const std::string& combined_clsid) { DWORD requested_version_ms = 0; DWORD requested_version_ls = 0; if (!ParseVersionFromCodebase(version, - &requested_version_ms, + &requested_version_ms, &requested_version_ls)) return true; // Get the path to the dll. diff --git a/webkit/activex_shim/activex_util.cc b/webkit/activex_shim/activex_util.cc index 7624e88..fbb9125 100644 --- a/webkit/activex_shim/activex_util.cc +++ b/webkit/activex_shim/activex_util.cc @@ -139,7 +139,7 @@ static bool DispGetFuncDesc(IDispatch* disp, const wchar_t* name, bool DispIsMethodOrProperty(IDispatch* disp, const wchar_t* name, bool checkmethod) { FUNCDESC funcdesc; - if (DispGetFuncDesc(disp, name, &funcdesc)) { + if (DispGetFuncDesc(disp, name, &funcdesc)) { // If it has multiple params, for PROPERTYGET, we have to treat it like a // method, because the scripting engine will not handle properties with // parameters. diff --git a/webkit/activex_shim/web_activex_site.h b/webkit/activex_shim/web_activex_site.h index 149d148..74ca89b 100644 --- a/webkit/activex_shim/web_activex_site.h +++ b/webkit/activex_shim/web_activex_site.h @@ -192,7 +192,7 @@ class WebActiveXSite : public MinimumIDispatchImpl, friend ActiveXPlugin; private: - // Call IOleObject::SetExtent to change the size of the control. width and + // Call IOleObject::SetExtent to change the size of the control. width and // height should be in pixels. HRESULT SetExtent(int width, int height); |