diff options
| author | paul@chromium.org <paul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-06 01:57:39 +0000 |
|---|---|---|
| committer | paul@chromium.org <paul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-06 01:57:39 +0000 |
| commit | d8cf7ab0d29dc10a0c4f262707f25dcc53cb68ea (patch) | |
| tree | 8b09fa5e99813052145d7fed44b993232e1f058d | |
| parent | 7f874dec33a8b047c65c1527fd8205e5d4ab63b1 (diff) | |
| download | chromium_src-d8cf7ab0d29dc10a0c4f262707f25dcc53cb68ea.zip chromium_src-d8cf7ab0d29dc10a0c4f262707f25dcc53cb68ea.tar.gz chromium_src-d8cf7ab0d29dc10a0c4f262707f25dcc53cb68ea.tar.bz2 | |
Port SafeBrowsingProtocolManager to Mac and linux.
Review URL: http://codereview.chromium.org/20119
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9301 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/browser.scons | 1 | ||||
| -rw-r--r-- | chrome/browser/safe_browsing/protocol_manager.h | 12 | ||||
| -rw-r--r-- | chrome/chrome.xcodeproj/project.pbxproj | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons index 6cd13a7..53378ae 100644 --- a/chrome/browser/browser.scons +++ b/chrome/browser/browser.scons @@ -751,7 +751,6 @@ if not env.Bit('windows'): 'printing/win_printing_context.cc', 'renderer_host/cross_site_resource_handler.cc', 'rlz/rlz.cc', - 'safe_browsing/protocol_manager.cc', 'safe_browsing/safe_browsing_blocking_page.cc', 'sandbox_policy.cc', 'search_engines/template_url_fetcher.cc', diff --git a/chrome/browser/safe_browsing/protocol_manager.h b/chrome/browser/safe_browsing/protocol_manager.h index 988ab3a..55c430a 100644 --- a/chrome/browser/safe_browsing/protocol_manager.h +++ b/chrome/browser/safe_browsing/protocol_manager.h @@ -29,6 +29,18 @@ class MessageLoop; class Task; class Timer; +#if defined(COMPILER_GCC) +// Allows us to use URLFetchers in a hash_map with gcc (MSVC is okay without +// specifying this). +namespace __gnu_cxx { +template<> +struct hash<const URLFetcher*> { + size_t operator()(const URLFetcher* fetcher) const { + return reinterpret_cast<size_t>(fetcher); + } +}; +} +#endif class SafeBrowsingProtocolManager : public URLFetcher::Delegate { // Testing friends: diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj index e3041c8..b6e6ae9 100644 --- a/chrome/chrome.xcodeproj/project.pbxproj +++ b/chrome/chrome.xcodeproj/project.pbxproj @@ -287,6 +287,7 @@ B61C4EDC0F34EE8300489E0F /* browser_process_impl.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF8430E9D4839009A6919 /* browser_process_impl.cc */; }; B6CCB9FA0F1EC33100106F0D /* provisional_load_details.cc in Sources */ = {isa = PBXBuildFile; fileRef = B6CCB9DE0F1EC32700106F0D /* provisional_load_details.cc */; }; B9BF55F87A4BB2FD366B6DDC /* template_url_parser.cc in Sources */ = {isa = PBXBuildFile; fileRef = 28AA584AB2ECFB33C7C7FD8A /* template_url_parser.cc */; }; + BAA609ED0F3BCAA800783510 /* protocol_manager.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BFAD50E9D49DE009A6919 /* protocol_manager.cc */; }; BADB8B710F3A35AC00989B26 /* resource_dispatcher_host.cc in Sources */ = {isa = PBXBuildFile; fileRef = BADB8B6D0F3A356000989B26 /* resource_dispatcher_host.cc */; }; E40CC5E30F2E348900708647 /* history_contents_provider.cc in Sources */ = {isa = PBXBuildFile; fileRef = E40CC5E10F2E348900708647 /* history_contents_provider.cc */; }; E40CC5EE0F2E34C100708647 /* base_history_model.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF82B0E9D4839009A6919 /* base_history_model.cc */; }; @@ -4633,6 +4634,7 @@ E48B6C2C0F27840B002E47EC /* password_form_manager.cc in Sources */, 826847800F2F69D1009F6555 /* profile.cc in Sources */, 8268477F0F2F69D1009F6555 /* profile_manager.cc in Sources */, + BAA609ED0F3BCAA800783510 /* protocol_manager.cc in Sources */, 4D7BFAF10E9D49EB009A6919 /* protocol_parser.cc in Sources */, B6CCB9FA0F1EC33100106F0D /* provisional_load_details.cc in Sources */, E4F324500EE5CF7C002533CE /* query_parser.cc in Sources */, |