diff options
author | paul@chromium.org <paul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-05 18:48:08 +0000 |
---|---|---|
committer | paul@chromium.org <paul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-05 18:48:08 +0000 |
commit | 81218f4d04c3e4c92458bfc287bb89f2bd26c5b8 (patch) | |
tree | 779bd470b6738e7d12ac1cae5d42107ee29eaa6c | |
parent | 990fcc8cf0ac25cba98a38ef04bd5527fad35ac3 (diff) | |
download | chromium_src-81218f4d04c3e4c92458bfc287bb89f2bd26c5b8.zip chromium_src-81218f4d04c3e4c92458bfc287bb89f2bd26c5b8.tar.gz chromium_src-81218f4d04c3e4c92458bfc287bb89f2bd26c5b8.tar.bz2 |
Port the ResourceDispatcherHost to Mac and linux.
Review URL: http://codereview.chromium.org/20073
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9231 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/browser.scons | 1 | ||||
-rw-r--r-- | chrome/browser/browser_main.cc | 2 | ||||
-rw-r--r-- | chrome/browser/browser_process_impl.cc | 9 | ||||
-rw-r--r-- | chrome/browser/renderer_host/browser_render_process_host.cc | 6 | ||||
-rw-r--r-- | chrome/browser/renderer_host/download_resource_handler.cc | 6 | ||||
-rw-r--r-- | chrome/browser/renderer_host/download_throttling_resource_handler.h | 6 | ||||
-rw-r--r-- | chrome/browser/renderer_host/resource_dispatcher_host.cc | 30 | ||||
-rw-r--r-- | chrome/browser/renderer_host/save_file_resource_handler.cc | 5 | ||||
-rw-r--r-- | chrome/browser/resource_message_filter.h | 3 | ||||
-rw-r--r-- | chrome/browser/resource_request_details.h | 8 | ||||
-rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_service.cc | 10 | ||||
-rw-r--r-- | chrome/chrome.xcodeproj/project.pbxproj | 6 | ||||
-rw-r--r-- | chrome/common/temp_scaffolding_stubs.cc | 32 | ||||
-rw-r--r-- | chrome/common/temp_scaffolding_stubs.h | 280 | ||||
-rw-r--r-- | net/base/x509_certificate.cc | 8 |
15 files changed, 348 insertions, 64 deletions
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons index 9c383f5..337dcdf 100644 --- a/chrome/browser/browser.scons +++ b/chrome/browser/browser.scons @@ -751,7 +751,6 @@ if not env.Bit('windows'): 'printing/printer_query.cc', 'printing/win_printing_context.cc', 'renderer_host/cross_site_resource_handler.cc', - 'renderer_host/resource_dispatcher_host.cc', 'repost_form_warning_dialog.cc', 'resource_message_filter.cc', 'rlz/rlz.cc', diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 4b1280e..23a8078 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -27,7 +27,6 @@ #include "chrome/browser/browser_process_impl.h" #include "chrome/browser/browser_shutdown.h" #include "chrome/browser/first_run.h" -#include "chrome/browser/plugin_service.h" #include "chrome/browser/profile_manager.h" #include "chrome/browser/shell_integration.h" #include "chrome/common/chrome_constants.h" @@ -73,6 +72,7 @@ #include "chrome/browser/net/dns_global.h" #include "chrome/browser/net/sdch_dictionary_fetcher.h" #include "chrome/browser/net/url_fixer_upper.h" +#include "chrome/browser/plugin_service.h" #include "chrome/browser/printing/print_job_manager.h" #include "chrome/browser/profile.h" #include "chrome/browser/profile_manager.h" diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 0ddfd17..cb8cd4b 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -11,9 +11,10 @@ #include "chrome/browser/browser_trial.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/google_url_tracker.h" -#include "chrome/browser/plugin_service.h" #include "chrome/browser/profile_manager.h" #include "chrome/browser/renderer_host/render_process_host.h" +#include "chrome/browser/renderer_host/resource_dispatcher_host.h" +#include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_service.h" @@ -26,14 +27,16 @@ #include "chrome/browser/download/save_file_manager.h" #include "chrome/browser/icon_manager.h" #include "chrome/browser/metrics/metrics_service.h" +#include "chrome/browser/plugin_service.h" #include "chrome/browser/printing/print_job_manager.h" -#include "chrome/browser/renderer_host/resource_dispatcher_host.h" -#include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/debugger/debugger_wrapper.h" #include "chrome/common/clipboard_service.h" #include "chrome/common/l10n_util.h" #include "chrome/views/accelerator_handler.h" #include "chrome/views/view_storage.h" +#elif defined(OS_POSIX) +// TODO(port): Remove the temporary scaffolding as we port the above headers. +#include "chrome/common/temp_scaffolding_stubs.h" #endif namespace { diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index 7ce1a6f..5e38b29 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -27,7 +27,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/cache_manager_host.h" #include "chrome/browser/extensions/user_script_master.h" -#include "chrome/browser/plugin_service.h" #include "chrome/browser/profile.h" #include "chrome/browser/renderer_host/render_widget_helper.h" #include "chrome/browser/renderer_host/renderer_security_policy.h" @@ -48,6 +47,8 @@ #include "net/base/net_util.h" #if defined(OS_WIN) +#include "chrome/browser/plugin_service.h" + // TODO(port): see comment by the only usage of RenderViewHost in this file. #include "chrome/browser/renderer_host/render_view_host.h" @@ -61,6 +62,9 @@ #include "chrome/browser/sandbox_policy.h" #include "chrome/common/win_util.h" #include "sandbox/src/sandbox.h" +#elif defined(OS_POSIX) +// TODO(port): Remove temporary scaffolding after porting the above headers. +#include "chrome/common/temp_scaffolding_stubs.h" #endif #include "SkBitmap.h" diff --git a/chrome/browser/renderer_host/download_resource_handler.cc b/chrome/browser/renderer_host/download_resource_handler.cc index 01704e7..de34a60 100644 --- a/chrome/browser/renderer_host/download_resource_handler.cc +++ b/chrome/browser/renderer_host/download_resource_handler.cc @@ -4,8 +4,14 @@ #include "chrome/browser/renderer_host/download_resource_handler.h" +#if defined(OS_POSIX) +// TODO(port): Remove the temporary scaffolding after porting the headers below. +#include "chrome/common/temp_scaffolding_stubs.h" +#elif defined(OS_WIN) #include "chrome/browser/download/download_file.h" #include "chrome/browser/download/download_manager.h" +#endif + #include "chrome/browser/renderer_host/resource_dispatcher_host.h" #include "net/base/io_buffer.h" diff --git a/chrome/browser/renderer_host/download_throttling_resource_handler.h b/chrome/browser/renderer_host/download_throttling_resource_handler.h index 97b2942..6f7c3d9 100644 --- a/chrome/browser/renderer_host/download_throttling_resource_handler.h +++ b/chrome/browser/renderer_host/download_throttling_resource_handler.h @@ -8,7 +8,13 @@ #include <string> #include "chrome/browser/renderer_host/resource_handler.h" + +#if defined(OS_WIN) +// TODO(port): Remove ifdef when downloads are ported. #include "chrome/browser/download/download_request_manager.h" +#elif defined(OS_POSIX) +#include "chrome/common/temp_scaffolding_stubs.h" +#endif class DownloadResourceHandler; class ResourceDispatcherHost; diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.cc b/chrome/browser/renderer_host/resource_dispatcher_host.cc index 3882372..8d12aac 100644 --- a/chrome/browser/renderer_host/resource_dispatcher_host.cc +++ b/chrome/browser/renderer_host/resource_dispatcher_host.cc @@ -11,27 +11,15 @@ #include "base/message_loop.h" #include "base/scoped_ptr.h" #include "base/time.h" -#include "chrome/browser/cert_store.h" #include "chrome/browser/cross_site_request_manager.h" -#include "chrome/browser/download/download_file.h" -#include "chrome/browser/download/download_manager.h" -#include "chrome/browser/download/download_request_manager.h" -#include "chrome/browser/download/save_file_manager.h" -#include "chrome/browser/external_protocol_handler.h" -#include "chrome/browser/login_prompt.h" -#include "chrome/browser/plugin_service.h" -#include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/renderer_host/render_view_host_delegate.h" #include "chrome/browser/renderer_host/async_resource_handler.h" #include "chrome/browser/renderer_host/buffered_resource_handler.h" -#include "chrome/browser/renderer_host/cross_site_resource_handler.h" #include "chrome/browser/renderer_host/download_resource_handler.h" #include "chrome/browser/renderer_host/renderer_security_policy.h" #include "chrome/browser/renderer_host/safe_browsing_resource_handler.h" #include "chrome/browser/renderer_host/save_file_resource_handler.h" #include "chrome/browser/renderer_host/sync_resource_handler.h" #include "chrome/browser/resource_request_details.h" -#include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/tab_contents/web_contents.h" #include "chrome/common/notification_service.h" @@ -44,6 +32,24 @@ #include "net/base/net_errors.h" #include "net/url_request/url_request.h" +// TODO(port): Move these includes to the above section when porting is done. +#if defined(OS_POSIX) +#include "chrome/common/temp_scaffolding_stubs.h" +#elif defined(OS_WIN) +#include "chrome/browser/cert_store.h" +#include "chrome/browser/download/download_file.h" +#include "chrome/browser/download/download_manager.h" +#include "chrome/browser/download/download_request_manager.h" +#include "chrome/browser/download/save_file_manager.h" +#include "chrome/browser/external_protocol_handler.h" +#include "chrome/browser/login_prompt.h" +#include "chrome/browser/plugin_service.h" +#include "chrome/browser/renderer_host/cross_site_resource_handler.h" +#include "chrome/browser/renderer_host/render_view_host.h" +#include "chrome/browser/renderer_host/render_view_host_delegate.h" +#include "chrome/browser/safe_browsing/safe_browsing_service.h" +#endif + // Uncomment to enable logging of request traffic. //#define LOG_RESOURCE_DISPATCHER_REQUESTS diff --git a/chrome/browser/renderer_host/save_file_resource_handler.cc b/chrome/browser/renderer_host/save_file_resource_handler.cc index 2520961..3a1b753 100644 --- a/chrome/browser/renderer_host/save_file_resource_handler.cc +++ b/chrome/browser/renderer_host/save_file_resource_handler.cc @@ -4,7 +4,12 @@ #include "chrome/browser/renderer_host/save_file_resource_handler.h" +#if defined(OS_POSIX) +#include "chrome/common/temp_scaffolding_stubs.h" +#elif defined(OS_WIN) #include "chrome/browser/download/save_file_manager.h" +#endif + #include "net/base/io_buffer.h" SaveFileResourceHandler::SaveFileResourceHandler(int render_process_host_id, diff --git a/chrome/browser/resource_message_filter.h b/chrome/browser/resource_message_filter.h index e517402..6b2db32 100644 --- a/chrome/browser/resource_message_filter.h +++ b/chrome/browser/resource_message_filter.h @@ -12,6 +12,7 @@ #include "base/ref_counted.h" #include "build/build_config.h" #include "chrome/browser/net/resolve_proxy_msg_helper.h" +#include "chrome/browser/renderer_host/resource_dispatcher_host.h" #include "chrome/common/ipc_channel_proxy.h" #include "chrome/common/modal_dialog_event.h" #include "chrome/common/notification_observer.h" @@ -19,9 +20,7 @@ #if defined(OS_WIN) #include <windows.h> -#include "chrome/browser/renderer_host/resource_dispatcher_host.h" #else -// TODO(port): port ResourceDispatcherHost. #include "chrome/common/temp_scaffolding_stubs.h" #endif diff --git a/chrome/browser/resource_request_details.h b/chrome/browser/resource_request_details.h index e4a4d9d..d8cd0cc 100644 --- a/chrome/browser/resource_request_details.h +++ b/chrome/browser/resource_request_details.h @@ -12,12 +12,18 @@ #include <string> #include "base/basictypes.h" -#include "chrome/browser/cert_store.h" #include "chrome/browser/renderer_host/resource_dispatcher_host.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_status.h" +#if defined(OS_WIN) +// TODO(port): Move header to the above section when CertStore has been ported. +#include "chrome/browser/cert_store.h" +#elif defined(OS_POSIX) +#include "chrome/common/temp_scaffolding_stubs.h" +#endif + // Details about a resource request notification. class ResourceRequestDetails { public: diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc index b524f22..d5c1884 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc @@ -14,8 +14,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/profile_manager.h" -#include "chrome/browser/safe_browsing/protocol_manager.h" -#include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h" #include "chrome/browser/safe_browsing/safe_browsing_database.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/common/chrome_constants.h" @@ -25,6 +23,14 @@ #include "chrome/common/pref_service.h" #include "net/base/registry_controlled_domain.h" +#if defined(OS_WIN) +// TODO(port): Place this header above once we've ported protocol_manager.* +#include "chrome/browser/safe_browsing/protocol_manager.h" +#include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h" +#elif defined(OS_POSIX) +#include "chrome/common/temp_scaffolding_stubs.h" +#endif + using base::Time; using base::TimeDelta; diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj index e711e1b..47f2842 100644 --- a/chrome/chrome.xcodeproj/project.pbxproj +++ b/chrome/chrome.xcodeproj/project.pbxproj @@ -285,6 +285,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 */; }; + 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 */; }; E40CC5F20F2E34EE00708647 /* bookmark_folder_tree_model.cc in Sources */ = {isa = PBXBuildFile; fileRef = E40CC5F00F2E34EE00708647 /* bookmark_folder_tree_model.cc */; }; @@ -2026,6 +2027,8 @@ B6CCB9F80F1EC32700106F0D /* web_drop_target.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = web_drop_target.cc; path = tab_contents/web_drop_target.cc; sourceTree = "<group>"; }; B6CCB9F90F1EC32700106F0D /* web_drop_target.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = web_drop_target.h; path = tab_contents/web_drop_target.h; sourceTree = "<group>"; }; B94B5B0CBF4D7FAC48BB1AE2 /* backing_store_posix.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = backing_store_posix.cc; path = browser/renderer_host/backing_store_posix.cc; sourceTree = SOURCE_ROOT; }; + BADB8B6D0F3A356000989B26 /* resource_dispatcher_host.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = resource_dispatcher_host.cc; path = renderer_host/resource_dispatcher_host.cc; sourceTree = "<group>"; }; + BADB8BD20F3A4E4900989B26 /* resource_dispatcher_host.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = resource_dispatcher_host.h; path = renderer_host/resource_dispatcher_host.h; sourceTree = "<group>"; }; C18F2A0A6FB6BEF75406511D /* chrome_paths_mac.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = chrome_paths_mac.cc; sourceTree = "<group>"; }; E40CC5E10F2E348900708647 /* history_contents_provider.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = history_contents_provider.cc; path = autocomplete/history_contents_provider.cc; sourceTree = "<group>"; }; E40CC5E20F2E348900708647 /* history_contents_provider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = history_contents_provider.h; path = autocomplete/history_contents_provider.h; sourceTree = "<group>"; }; @@ -3617,6 +3620,8 @@ A76E42980F28ECAD009A7E88 /* renderer_security_policy.cc */, A76E42990F28ECAD009A7E88 /* renderer_security_policy.h */, A76E429A0F28ECAD009A7E88 /* renderer_security_policy_unittest.cc */, + BADB8BD20F3A4E4900989B26 /* resource_dispatcher_host.h */, + BADB8B6D0F3A356000989B26 /* resource_dispatcher_host.cc */, E45075E60F150ABA003BE099 /* safe_browsing_resource_handler.cc */, E45075E70F150ABA003BE099 /* safe_browsing_resource_handler.h */, E45075E80F150ABA003BE099 /* save_file_resource_handler.cc */, @@ -4630,6 +4635,7 @@ E434BBBF0F37D6DB00B665C7 /* render_widget_helper.cc in Sources */, E434BFA40F3A03E200B665C7 /* render_widget_host.cc in Sources */, E434BBEB0F37DFA500B665C7 /* renderer_security_policy.cc in Sources */, + BADB8B710F3A35AC00989B26 /* resource_dispatcher_host.cc in Sources */, B0AC9501DED2809AC208AEEA /* resolve_proxy_msg_helper.cc in Sources */, 4D7BFAF30E9D49EF009A6919 /* safe_browsing_database.cc in Sources */, E48FB9590EC4E9C10052B72B /* safe_browsing_database_bloom.cc in Sources */, diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc index 7267057..350d760 100644 --- a/chrome/common/temp_scaffolding_stubs.cc +++ b/chrome/common/temp_scaffolding_stubs.cc @@ -16,7 +16,6 @@ #include "chrome/browser/cache_manager_host.h" #include "chrome/browser/first_run.h" #include "chrome/browser/history/in_memory_history_backend.h" -#include "chrome/browser/plugin_service.h" #include "chrome/browser/profile_manager.h" #include "chrome/browser/renderer_host/render_widget_helper.h" #include "chrome/browser/resource_message_filter.h" @@ -272,6 +271,15 @@ bool SSLManager::DeserializeSecurityInfo(const std::string&, int*, int*, int*) { return false; } +void SSLManager::OnSSLCertificateError( + ResourceDispatcherHost* resource_dispatcher, + URLRequest* request, + int cert_error, + net::X509Certificate* cert, + MessageLoop* ui_loop) { + NOTIMPLEMENTED(); +} + //-------------------------------------------------------------------------- ResourceMessageFilter::ResourceMessageFilter( @@ -325,13 +333,30 @@ ResourceBundle& ResourceBundle::GetSharedInstance() { } #endif -void ResourceDispatcherHost::OnClosePageACK(int, int) { +LoginHandler* CreateLoginPrompt(net::AuthChallengeInfo* auth_info, + URLRequest* request, + MessageLoop* ui_loop) { NOTIMPLEMENTED(); + return NULL; } -void ResourceDispatcherHost::CancelRequestsForRenderView(int, int) { + +namespace tab_util { + +bool GetTabContentsID(URLRequest* request, + int* render_process_host_id, + int* routing_id) { NOTIMPLEMENTED(); + return true; } +WebContents* GetWebContentsByID(int render_process_host_id, + int render_view_id) { + NOTIMPLEMENTED(); + return NULL; +} + +} // namespace + void ProcessWatcher::EnsureProcessTerminated(int) { NOTIMPLEMENTED(); } @@ -346,3 +371,4 @@ bool WebCursor::Deserialize(const Pickle* pickle, void** iter) { return false; } #endif + diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h index e11cc76..7828dfa 100644 --- a/chrome/common/temp_scaffolding_stubs.h +++ b/chrome/common/temp_scaffolding_stubs.h @@ -21,6 +21,11 @@ #include "chrome/browser/bookmarks/bookmark_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/cache_manager_host.h" +#include "chrome/browser/download/save_types.h" +#include "chrome/browser/history/download_types.h" +#include "chrome/browser/renderer_host/resource_handler.h" +#include "chrome/browser/safe_browsing/safe_browsing_util.h" +#include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents_type.h" @@ -34,6 +39,7 @@ #include "chrome/common/pref_service.h" #include "chrome/common/render_messages.h" #include "googleurl/src/gurl.h" +#include "net/base/load_states.h" #include "skia/include/SkBitmap.h" #include "webkit/glue/password_form.h" #include "webkit/glue/window_open_disposition.h" @@ -45,7 +51,9 @@ class ConstrainedWindow; class DOMUIHost; class DownloadManager; class HistoryService; +class LoginHandler; class MetricsService; +class MixedContentHandler; class ModalHtmlDialogDelegate; class NavigationController; class NavigationEntry; @@ -63,6 +71,7 @@ struct ThumbnailScore; class Task; class TemplateURL; class TemplateURLRef; +class URLRequest; class URLRequestContext; class UserScriptMaster; class VisitedLinkMaster; @@ -73,6 +82,12 @@ namespace IPC { class Message; } +namespace net { +class AuthChallengeInfo; +class IOBuffer; +class X509Certificate; +} + //--------------------------------------------------------------------------- // These stubs are for Browser_main() @@ -287,21 +302,120 @@ class PrintJobManager { } // namespace printing -class SafeBrowsingService - : public base::RefCountedThreadSafe<SafeBrowsingService> { + +class SafeBrowsingBlockingPage { + public: + static void ShowBlockingPage( + SafeBrowsingService* service, + const SafeBrowsingService::UnsafeResource& resource) { + NOTIMPLEMENTED(); + } +}; + +class SafeBrowsingProtocolManager { public: - void ShutDown() { NOTIMPLEMENTED(); } + SafeBrowsingProtocolManager(SafeBrowsingService* service, + MessageLoop* notify_loop, + const std::string& client_key, + const std::string& wrapped_key) { + NOTIMPLEMENTED(); + } + + ~SafeBrowsingProtocolManager() { NOTIMPLEMENTED(); } + void OnChunkInserted() { NOTIMPLEMENTED(); } + void OnGetChunksComplete(const std::vector<SBListChunkRanges>& list, + bool database_error) { + NOTIMPLEMENTED(); + } + void Initialize() { NOTIMPLEMENTED(); } + base::Time last_update() const { return last_update_; } + void GetFullHash(SafeBrowsingService::SafeBrowsingCheck* check, + const std::vector<SBPrefix>& prefixes) { + NOTIMPLEMENTED(); + } + private: + base::Time last_update_; +}; + +struct DownloadBuffer { + Lock lock; + typedef std::pair<net::IOBuffer*, int> Contents; + std::vector<Contents> contents; +}; + +class DownloadItem { +public: + enum DownloadState { + IN_PROGRESS, + COMPLETE, + CANCELLED, + REMOVING + }; }; class DownloadFileManager : public base::RefCountedThreadSafe<DownloadFileManager> { public: + DownloadFileManager(MessageLoop* ui_loop, ResourceDispatcherHost* rdh) { + NOTIMPLEMENTED(); + } + void Initialize() { NOTIMPLEMENTED(); } void Shutdown() { NOTIMPLEMENTED(); } + MessageLoop* file_loop() const { + NOTIMPLEMENTED(); + return NULL; + } + int GetNextId() { + NOTIMPLEMENTED(); + return 0; + } + void StartDownload(DownloadCreateInfo* info) { NOTIMPLEMENTED(); } + void UpdateDownload(int id, DownloadBuffer* buffer) { NOTIMPLEMENTED(); } + void DownloadFinished(int id, DownloadBuffer* buffer) { NOTIMPLEMENTED(); } +}; + +class DownloadRequestManager + : public base::RefCountedThreadSafe<DownloadRequestManager> { + public: + DownloadRequestManager(MessageLoop* io_loop, MessageLoop* ui_loop) { + NOTIMPLEMENTED(); + } + class Callback { + public: + virtual void ContinueDownload() = 0; + virtual void CancelDownload() = 0; + }; + void CanDownloadOnIOThread(int render_process_host_id, + int render_view_id, + Callback* callback) { + NOTIMPLEMENTED(); + } }; class SaveFileManager : public base::RefCountedThreadSafe<SaveFileManager> { public: + SaveFileManager(MessageLoop* ui_loop, + MessageLoop* io_loop, + ResourceDispatcherHost* rdh) { + NOTIMPLEMENTED(); + } void Shutdown() { NOTIMPLEMENTED(); } + void StartSave(SaveFileCreateInfo* info) { NOTIMPLEMENTED(); } + void UpdateSaveProgress(int save_id, net::IOBuffer* data, int size) { + NOTIMPLEMENTED(); + } + void SaveFinished(int save_id, const std::wstring& save_url, + int render_process_id, int is_success) { + NOTIMPLEMENTED(); + } + int GetNextId() { + NOTIMPLEMENTED(); + return 0; + } + MessageLoop* GetSaveLoop() { + NOTIMPLEMENTED(); + return NULL; + } }; namespace sandbox { @@ -319,40 +433,6 @@ class IconManager { struct ViewHostMsg_DidPrintPage_Params; struct ViewHostMsg_FrameNavigate_Params; -class ResourceDispatcherHost { - public: - explicit ResourceDispatcherHost(MessageLoop* loop) {} - - class Receiver { - public: - virtual bool Send(IPC::Message* message) = 0; - }; - void OnClosePageACK(int, int); - void CancelRequestsForRenderView(int, int); - void Initialize() { NOTIMPLEMENTED(); } - void Shutdown() { NOTIMPLEMENTED(); } - - SafeBrowsingService* safe_browsing_service() { - NOTIMPLEMENTED(); - return const_cast<SafeBrowsingService*>(&safe_browsing_service_); - } - - DownloadFileManager* download_file_manager() { - NOTIMPLEMENTED(); - return const_cast<DownloadFileManager*>(&download_file_manager_); - } - - SaveFileManager* save_file_manager() { - NOTIMPLEMENTED(); - return const_cast<SaveFileManager*>(&save_file_manager_); - } - - private: - SafeBrowsingService safe_browsing_service_; - DownloadFileManager download_file_manager_; - SaveFileManager save_file_manager_; -}; - class DebuggerWrapper : public base::RefCountedThreadSafe<DebuggerWrapper> { public: explicit DebuggerWrapper(int port) {} @@ -507,7 +587,6 @@ class RenderWidgetHostView { virtual void SetSize(gfx::Size) { NOTIMPLEMENTED(); } }; - class LoadNotificationDetails { public: LoadNotificationDetails(const GURL&, PageTransition::Type, @@ -880,6 +959,30 @@ class PluginInstaller { PluginInstaller(WebContents*) { } }; +class PluginService { + public: + static PluginService* GetInstance(); + PluginService(); + ~PluginService(); + void LoadChromePlugins(ResourceDispatcherHost* rdh) { + NOTIMPLEMENTED(); + } + bool HavePluginFor(const std::string& mime_type, bool allow_wildcard) { + NOTIMPLEMENTED(); + return true; + } + void SetChromePluginDataDir(const FilePath& data_dir); + private: + MessageLoop* main_message_loop_; + ResourceDispatcherHost* resource_dispatcher_host_; + FilePath chrome_plugin_data_dir_; + std::wstring ui_locale_; + Lock lock_; + class ShutdownHandler : public base::RefCountedThreadSafe<ShutdownHandler> { + }; + scoped_refptr<ShutdownHandler> plugin_shutdown_handler_; +}; + class HungRendererWarning { public: static void HideForWebContents(WebContents*) { NOTIMPLEMENTED(); } @@ -907,6 +1010,21 @@ class SSLManager { ~SSLManager() { } void NavigationStateChanged() { NOTIMPLEMENTED(); } static bool DeserializeSecurityInfo(const std::string&, int*, int*, int*); + static void OnSSLCertificateError(ResourceDispatcherHost* rdh, + URLRequest* request, + int cert_error, + net::X509Certificate* cert, + MessageLoop* ui_loop); + static std::string SerializeSecurityInfo(int cert_id, + int cert_status, + int security_bits) { + NOTIMPLEMENTED(); + return std::string(); + } + static void OnMixedContentRequest(ResourceDispatcherHost* rdh, + URLRequest* request, + MessageLoop* ui_loop) { NOTIMPLEMENTED(); } + void OnMixedContent(MixedContentHandler* mixed_content) { NOTIMPLEMENTED(); } }; class ModalHtmlDialogDelegate { @@ -929,6 +1047,92 @@ class SimpleAlertInfoBarDelegate : public InfoBarDelegate { SimpleAlertInfoBarDelegate(WebContents*, const std::wstring&, void*) {} }; +class CertStore { + public: + static CertStore* GetInstance() { + NOTIMPLEMENTED(); + return NULL; + } + static CertStore* GetSharedInstance() { + NOTIMPLEMENTED(); + return NULL; + } + int StoreCert(net::X509Certificate* cert, int render_process_host_id) { + NOTIMPLEMENTED(); + return 0; + } +}; + +class LoginHandler { + public: + void SetAuth(const std::wstring& username, + const std::wstring& password) { + NOTIMPLEMENTED(); + } + void CancelAuth() { NOTIMPLEMENTED(); } + void OnRequestCancelled() { NOTIMPLEMENTED(); } +}; + +LoginHandler* CreateLoginPrompt(net::AuthChallengeInfo* auth_info, + URLRequest* request, + MessageLoop* ui_loop); + +class CrossSiteResourceHandler : public ResourceHandler { + public: + CrossSiteResourceHandler(ResourceHandler* resource, + int render_process_host_id, + int render_view_id, + ResourceDispatcherHost* rdh) { + NOTIMPLEMENTED(); + } + + void ResumeResponse() { NOTIMPLEMENTED(); } + bool OnUploadProgress(int request_id, uint64 position, uint64 size) { + NOTIMPLEMENTED(); + return true; + } + bool OnRequestRedirected(int request_id, const GURL& url) { + NOTIMPLEMENTED(); + return true; + } + bool OnResponseStarted(int request_id, ResourceResponse* response) { + NOTIMPLEMENTED(); + return true; + } + bool OnWillRead(int request_id, + net::IOBuffer** buf, + int* buf_size, + int min_size) { + NOTIMPLEMENTED(); + return true; + } + bool OnReadCompleted(int request_id, int* bytes_read) { + NOTIMPLEMENTED(); + return true; + } + bool OnResponseCompleted(int request_id, + const URLRequestStatus& status) { + NOTIMPLEMENTED(); + return true; + } +}; + +class ExternalProtocolHandler { + public: + static void LaunchUrl(const GURL& url, int render_process_host_id, + int tab_contents_id) { + NOTIMPLEMENTED(); + } +}; + +namespace tab_util { +bool GetTabContentsID(URLRequest* request, + int* render_process_host_id, + int* routing_id); +WebContents* GetWebContentsByID(int render_process_host_id, + int render_view_id); +} + class RepostFormWarningDialog { public: static void RunRepostFormWarningDialog(NavigationController*) { } diff --git a/net/base/x509_certificate.cc b/net/base/x509_certificate.cc index 443ef81..4a7a9e4 100644 --- a/net/base/x509_certificate.cc +++ b/net/base/x509_certificate.cc @@ -184,5 +184,13 @@ X509Certificate::~X509Certificate() { FreeOSCertHandle(cert_handle_); } +#if defined(OS_LINUX) +// TODO(port): Implement properly on Linux. +bool X509Certificate::IsEV(int status) const { + NOTIMPLEMENTED(); + return true; +} +#endif + } // namespace net |