summaryrefslogtreecommitdiffstats
path: root/webkit/activex_shim/activex_shared.cc
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-05 12:46:38 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-05 12:46:38 +0000
commitf0a51fb571f46531025fa09240bbc3e1af925e84 (patch)
tree558b4f0e737fda4b9ab60f252c9c23b8a4ca523e /webkit/activex_shim/activex_shared.cc
parent6390be368205705f49ead3cec40396519f13b889 (diff)
downloadchromium_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/activex_shared.cc')
-rw-r--r--webkit/activex_shim/activex_shared.cc10
1 files changed, 5 insertions, 5 deletions
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.