diff options
| author | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-05 23:14:41 +0000 |
|---|---|---|
| committer | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-05 23:14:41 +0000 |
| commit | 39278018206ee0a46d00af8ed8f7b0ae28036d0e (patch) | |
| tree | 63c7740fde9fad1f70a021813f85727538b5f27c /o3d | |
| parent | 4dc69e7976ea44a8570feed29c2a233f23a9d074 (diff) | |
| download | chromium_src-39278018206ee0a46d00af8ed8f7b0ae28036d0e.zip chromium_src-39278018206ee0a46d00af8ed8f7b0ae28036d0e.tar.gz chromium_src-39278018206ee0a46d00af8ed8f7b0ae28036d0e.tar.bz2 | |
Linux: Fix build break in r40786 due to file not ending with a newline. (Don't know why the trybot didn't catch that ...) Also fix a GCC signedness warning when compiling the domain whitelist code.
TEST=built on Linux
BUG=none
Review URL: http://codereview.chromium.org/669206
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40792 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/plugin/cross/whitelist.cc | 2 | ||||
| -rw-r--r-- | o3d/plugin/cross/whitelist.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/o3d/plugin/cross/whitelist.cc b/o3d/plugin/cross/whitelist.cc index 524a57b..5d98caf 100644 --- a/o3d/plugin/cross/whitelist.cc +++ b/o3d/plugin/cross/whitelist.cc @@ -144,7 +144,7 @@ static bool IsDomainWhitelisted(const std::string &in_url) { host[i] = tolower(host[i]); } - for (int i = 0; i < arraysize(kDomainWhitelist); ++i) { + for (size_t i = 0; i < arraysize(kDomainWhitelist); ++i) { size_t pos = host.rfind(kDomainWhitelist[i]); if (pos != std::string::npos && ((pos + strlen(kDomainWhitelist[i]) == host.length()))) diff --git a/o3d/plugin/cross/whitelist.h b/o3d/plugin/cross/whitelist.h index f6cf277..150043a 100644 --- a/o3d/plugin/cross/whitelist.h +++ b/o3d/plugin/cross/whitelist.h @@ -41,4 +41,4 @@ bool IsDomainAuthorized(NPP instance); } // namespace o3d -#endif // O3D_PLUGIN_CROSS_WHITELIST_H_
\ No newline at end of file +#endif // O3D_PLUGIN_CROSS_WHITELIST_H_ |