diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-18 19:47:21 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-18 19:47:21 +0000 |
| commit | 319d9e6f29cc2d27c0f72ce701d905d2402c350a (patch) | |
| tree | 5d637ba43b9aeed5c925e694e50aa251230c0b92 | |
| parent | 22f21125f11953e1022f5e75e560c1af9484503e (diff) | |
| download | chromium_src-319d9e6f29cc2d27c0f72ce701d905d2402c350a.zip chromium_src-319d9e6f29cc2d27c0f72ce701d905d2402c350a.tar.gz chromium_src-319d9e6f29cc2d27c0f72ce701d905d2402c350a.tar.bz2 | |
Reduce the amount of included header files. Vast change like in "Oh God! This revision changes half of the source files!".
Review URL: http://codereview.chromium.org/20378
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9958 0039d316-1c4b-4281-b951-d872f2087c98
130 files changed, 1544 insertions, 1261 deletions
diff --git a/base/atomic_ref_count.h b/base/atomic_ref_count.h index 66fe07b..63b8e18 100644 --- a/base/atomic_ref_count.h +++ b/base/atomic_ref_count.h @@ -9,7 +9,6 @@ #define BASE_ATOMIC_REF_COUNT_H_ #include "base/atomicops.h" -#include "base/basictypes.h" namespace base { diff --git a/base/ref_counted.h b/base/ref_counted.h index 853fa90..013bd66 100644 --- a/base/ref_counted.h +++ b/base/ref_counted.h @@ -6,7 +6,6 @@ #define BASE_REF_COUNTED_H_ #include "base/atomic_ref_count.h" -#include "base/basictypes.h" #include "base/thread_collision_warner.h" namespace base { diff --git a/base/revocable_store.h b/base/revocable_store.h index 60ada5c..b0f1f31 100644 --- a/base/revocable_store.h +++ b/base/revocable_store.h @@ -2,11 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_REVOCABLE_STORE_H__ -#define BASE_REVOCABLE_STORE_H__ +#ifndef BASE_REVOCABLE_STORE_H_ +#define BASE_REVOCABLE_STORE_H_ -#include "base/basictypes.h" -#include "base/logging.h" #include "base/ref_counted.h" // |RevocableStore| is a container of items that can be removed from the store. @@ -73,5 +71,4 @@ class RevocableStore { DISALLOW_EVIL_CONSTRUCTORS(RevocableStore); }; -#endif // BASE_REVOCABLE_STORE_H__ - +#endif // BASE_REVOCABLE_STORE_H_ diff --git a/base/task.h b/base/task.h index a00555a..e1c1dd0 100644 --- a/base/task.h +++ b/base/task.h @@ -2,16 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_TASK_H__ -#define BASE_TASK_H__ +#ifndef BASE_TASK_H_ +#define BASE_TASK_H_ -#include <set> - -#include "base/basictypes.h" #include "base/logging.h" #include "base/non_thread_safe.h" #include "base/revocable_store.h" -#include "base/time.h" #include "base/tracked.h" #include "base/tuple.h" @@ -667,5 +663,4 @@ class UnboundMethod { Params p_; }; -#endif // BASE_TASK_H__ - +#endif // BASE_TASK_H_ diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc index b160bb5..e931912 100644 --- a/chrome/browser/autocomplete/search_provider.cc +++ b/chrome/browser/autocomplete/search_provider.cc @@ -17,6 +17,8 @@ #include "chrome/common/pref_service.h" #include "googleurl/src/url_util.h" #include "net/base/escape.h" +#include "net/http/http_response_headers.h" +#include "net/url_request/url_request_status.h" #include "generated_resources.h" diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index 0de0782..013325c 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -37,6 +37,7 @@ #include "chrome/views/window.h" #include "chrome/test/automation/automation_messages.h" #include "net/base/cookie_monster.h" +#include "net/url_request/url_request_context.h" #include "net/url_request/url_request_filter.h" using base::Time; diff --git a/chrome/browser/automation/url_request_mock_http_job.cc b/chrome/browser/automation/url_request_mock_http_job.cc index ed384e6..9c0376f 100644 --- a/chrome/browser/automation/url_request_mock_http_job.cc +++ b/chrome/browser/automation/url_request_mock_http_job.cc @@ -8,6 +8,7 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "net/base/net_util.h" +#include "net/http/http_response_headers.h" #include "net/url_request/url_request_filter.h" static const char kMockHostname[] = "mock.http"; diff --git a/chrome/browser/automation/url_request_slow_download_job.cc b/chrome/browser/automation/url_request_slow_download_job.cc index 71f71ca..e185204 100644 --- a/chrome/browser/automation/url_request_slow_download_job.cc +++ b/chrome/browser/automation/url_request_slow_download_job.cc @@ -7,6 +7,7 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "googleurl/src/gurl.h" +#include "net/http/http_response_headers.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_filter.h" diff --git a/chrome/browser/chrome_plugin_host.cc b/chrome/browser/chrome_plugin_host.cc index 88fd40e..963bca1 100644 --- a/chrome/browser/chrome_plugin_host.cc +++ b/chrome/browser/chrome_plugin_host.cc @@ -8,14 +8,13 @@ #include "base/command_line.h" #include "base/file_util.h" +#include "base/gfx/png_encoder.h" #include "base/histogram.h" #include "base/message_loop.h" #include "base/path_service.h" #include "base/perftimer.h" #include "base/singleton.h" #include "base/string_util.h" -#include "net/base/cookie_monster.h" -#include "net/url_request/url_request_error_job.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/chrome_plugin_browsing_context.h" #include "chrome/browser/chrome_thread.h" @@ -37,12 +36,10 @@ #include "chrome/common/net/url_request_intercept_job.h" #include "chrome/common/plugin_messages.h" #include "chrome/common/render_messages.h" - -#include "base/gfx/png_encoder.h" -#include "base/logging.h" -#include "base/string_util.h" -#include "googleurl/src/gurl.h" #include "net/base/base64.h" +#include "net/base/cookie_monster.h" +#include "net/url_request/url_request_context.h" +#include "net/url_request/url_request_error_job.h" #include "skia/include/SkBitmap.h" using base::TimeDelta; diff --git a/chrome/browser/debugger/debugger_contents.cc b/chrome/browser/debugger/debugger_contents.cc index 2756244..19565e8 100644 --- a/chrome/browser/debugger/debugger_contents.cc +++ b/chrome/browser/debugger/debugger_contents.cc @@ -6,6 +6,7 @@ #include "base/command_line.h" #include "base/file_util.h" +#include "base/string_util.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/debugger/debugger_contents.h" diff --git a/chrome/browser/dom_ui/dom_ui.cc b/chrome/browser/dom_ui/dom_ui.cc index 65e7d3d..1fe8d99 100644 --- a/chrome/browser/dom_ui/dom_ui.cc +++ b/chrome/browser/dom_ui/dom_ui.cc @@ -6,6 +6,7 @@ #include "base/json_reader.h" #include "base/json_writer.h" +#include "base/string_util.h" #include "base/values.h" #include "chrome/common/l10n_util.h" diff --git a/chrome/browser/external_protocol_handler.cc b/chrome/browser/external_protocol_handler.cc index ff55afa..d438f64 100644 --- a/chrome/browser/external_protocol_handler.cc +++ b/chrome/browser/external_protocol_handler.cc @@ -12,6 +12,7 @@ #include "base/message_loop.h" #include "base/registry.h" #include "base/scoped_ptr.h" +#include "base/string_util.h" #include "base/thread.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_process_impl.h" diff --git a/chrome/browser/google_url_tracker.cc b/chrome/browser/google_url_tracker.cc index cdc2a4cd..2e26147 100644 --- a/chrome/browser/google_url_tracker.cc +++ b/chrome/browser/google_url_tracker.cc @@ -12,6 +12,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "net/base/load_flags.h" +#include "net/url_request/url_request_status.h" const char GoogleURLTracker::kDefaultGoogleHomepage[] = "http://www.google.com/"; diff --git a/chrome/browser/google_url_tracker.h b/chrome/browser/google_url_tracker.h index ce19f6c..e4edcf6 100644 --- a/chrome/browser/google_url_tracker.h +++ b/chrome/browser/google_url_tracker.h @@ -7,6 +7,7 @@ #include "chrome/browser/net/url_fetcher.h" #include "chrome/common/notification_observer.h" +#include "googleurl/src/gurl.h" class PrefService; diff --git a/chrome/browser/ime_input.h b/chrome/browser/ime_input.h index 8175887..2f1d1b9 100644 --- a/chrome/browser/ime_input.h +++ b/chrome/browser/ime_input.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_IME_INPUT_H__ -#define CHROME_BROWSER_IME_INPUT_H__ +#ifndef CHROME_BROWSER_IME_INPUT_H_ +#define CHROME_BROWSER_IME_INPUT_H_ #include <windows.h> #include <string> #include "base/basictypes.h" -#include "base/gfx/Rect.h" +#include "base/gfx/rect.h" // This header file defines a struct and a class used for encapsulating IMM32 // APIs, controls IMEs attached to a window, and enables the 'on-the-spot' @@ -303,5 +303,4 @@ class ImeInput { DISALLOW_EVIL_CONSTRUCTORS(ImeInput); }; -#endif // #ifndef CHROME_BROWSER_IME_INPUT_H__ - +#endif // #ifndef CHROME_BROWSER_IME_INPUT_H_ diff --git a/chrome/browser/jsmessage_box_handler_win.cc b/chrome/browser/jsmessage_box_handler_win.cc index 9c48f9e..541253e 100644 --- a/chrome/browser/jsmessage_box_handler_win.cc +++ b/chrome/browser/jsmessage_box_handler_win.cc @@ -4,6 +4,7 @@ #include "chrome/browser/jsmessage_box_handler_win.h" +#include "base/string_util.h" #include "chrome/browser/app_modal_dialog_queue.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profile.h" diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc index 7c81d6f..6b692bf 100644 --- a/chrome/browser/memory_details.cc +++ b/chrome/browser/memory_details.cc @@ -6,17 +6,9 @@ #include <psapi.h> #include "base/file_version_info.h" -#include "base/histogram.h" -#include "base/image_util.h" -#include "base/message_loop.h" -#include "base/process_util.h" -#include "base/scoped_ptr.h" -#include "base/thread.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/renderer_host/render_process_host.h" -#include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/web_contents.h" #include "chrome/common/child_process_host.h" diff --git a/chrome/browser/memory_details.h b/chrome/browser/memory_details.h index 17a00a1..f63a6f5 100644 --- a/chrome/browser/memory_details.h +++ b/chrome/browser/memory_details.h @@ -5,11 +5,8 @@ #ifndef CHROME_BROWSER_MEMORY_DETAILS_H_ #define CHROME_BROWSER_MEMORY_DETAILS_H_ - -#include <string> #include <vector> -#include "base/file_path.h" #include "base/process_util.h" #include "base/ref_counted.h" #include "chrome/common/child_process_info.h" diff --git a/chrome/browser/net/dns_global.cc b/chrome/browser/net/dns_global.cc index 67e4265..4e1f1a2 100644 --- a/chrome/browser/net/dns_global.cc +++ b/chrome/browser/net/dns_global.cc @@ -20,7 +20,6 @@ #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "googleurl/src/gurl.h" #include "net/base/dns_resolution_observer.h" using base::TimeDelta; diff --git a/chrome/browser/net/dns_master.cc b/chrome/browser/net/dns_master.cc index 34efe37..d58bb4b 100644 --- a/chrome/browser/net/dns_master.cc +++ b/chrome/browser/net/dns_master.cc @@ -6,7 +6,7 @@ #include "chrome/browser/net/dns_master.h" -#include <sstream> +#include <set> #include "base/histogram.h" #include "base/stats_counters.h" diff --git a/chrome/browser/net/sdch_dictionary_fetcher.cc b/chrome/browser/net/sdch_dictionary_fetcher.cc index 9bce5f3..3a36bde 100644 --- a/chrome/browser/net/sdch_dictionary_fetcher.cc +++ b/chrome/browser/net/sdch_dictionary_fetcher.cc @@ -3,7 +3,9 @@ // found in the LICENSE file. #include "chrome/browser/net/sdch_dictionary_fetcher.h" + #include "chrome/browser/profile.h" +#include "net/url_request/url_request_status.h" void SdchDictionaryFetcher::Schedule(const GURL& dictionary_url) { // Avoid pushing duplicate copy onto queue. We may fetch this url again later diff --git a/chrome/browser/net/url_fetcher.cc b/chrome/browser/net/url_fetcher.cc index 9e41f22..dcec935 100644 --- a/chrome/browser/net/url_fetcher.cc +++ b/chrome/browser/net/url_fetcher.cc @@ -12,9 +12,87 @@ #include "googleurl/src/gurl.h" #include "net/base/load_flags.h" #include "net/base/io_buffer.h" +#include "net/http/http_response_headers.h" +#include "net/url_request/url_request.h" +#include "net/url_request/url_request_context.h" static const int kBufferSize = 4096; +class URLFetcher::Core + : public base::RefCountedThreadSafe<URLFetcher::Core>, + public URLRequest::Delegate { + public: + // For POST requests, set |content_type| to the MIME type of the content + // and set |content| to the data to upload. |flags| are flags to apply to + // the load operation--these should be one or more of the LOAD_* flags + // defined in url_request.h. + Core(URLFetcher* fetcher, + const GURL& original_url, + RequestType request_type, + URLFetcher::Delegate* d); + + // Starts the load. It's important that this not happen in the constructor + // because it causes the IO thread to begin AddRef()ing and Release()ing + // us. If our caller hasn't had time to fully construct us and take a + // reference, the IO thread could interrupt things, run a task, Release() + // us, and destroy us, leaving the caller with an already-destroyed object + // when construction finishes. + void Start(); + + // Stops any in-progress load and ensures no callback will happen. It is + // safe to call this multiple times. + void Stop(); + + // URLRequest::Delegate implementations + virtual void OnReceivedRedirect(URLRequest* request, + const GURL& new_url) { } + virtual void OnResponseStarted(URLRequest* request); + virtual void OnReadCompleted(URLRequest* request, int bytes_read); + + private: + // Wrapper functions that allow us to ensure actions happen on the right + // thread. + void StartURLRequest(); + void CancelURLRequest(); + void OnCompletedURLRequest(const URLRequestStatus& status); + + URLFetcher* fetcher_; // Corresponding fetcher object + GURL original_url_; // The URL we were asked to fetch + GURL url_; // The URL we eventually wound up at + RequestType request_type_; // What type of request is this? + URLFetcher::Delegate* delegate_; // Object to notify on completion + MessageLoop* delegate_loop_; // Message loop of the creating thread + MessageLoop* io_loop_; // Message loop of the IO thread + URLRequest* request_; // The actual request this wraps + int load_flags_; // Flags for the load operation + int response_code_; // HTTP status code for the request + std::string data_; // Results of the request + scoped_refptr<net::IOBuffer> buffer_; + // Read buffer + scoped_refptr<URLRequestContext> request_context_; + // Cookie/cache info for the request + ResponseCookies cookies_; // Response cookies + std::string extra_request_headers_;// Extra headers for the request, if any + scoped_refptr<net::HttpResponseHeaders> response_headers_; + + std::string upload_content_; // HTTP POST payload + std::string upload_content_type_; // MIME type of POST payload + + // The overload protection entry for this URL. This is used to + // incrementally back off how rapidly we'll send requests to a particular + // URL, to avoid placing too much demand on the remote resource. We update + // this with the status of all requests as they return, and in turn use it + // to determine how long to wait before making another request. + URLFetcherProtectEntry* protect_entry_; + // |num_retries_| indicates how many times we've failed to successfully + // fetch this URL. Once this value exceeds the maximum number of retries + // specified by the protection manager, we'll give up. + int num_retries_; + + friend class URLFetcher; + DISALLOW_COPY_AND_ASSIGN(Core); +}; + URLFetcher::URLFetcher(const GURL& url, RequestType request_type, Delegate* d) @@ -184,3 +262,38 @@ void URLFetcher::Core::OnCompletedURLRequest(const URLRequestStatus& status) { cookies_, data_); } } + +void URLFetcher::set_io_loop(MessageLoop* io_loop) { + core_->io_loop_ = io_loop; +} + +void URLFetcher::set_upload_data(const std::string& upload_content_type, + const std::string& upload_content) { + core_->upload_content_type_ = upload_content_type; + core_->upload_content_ = upload_content; +} + +void URLFetcher::set_load_flags(int load_flags) { + core_->load_flags_ = load_flags; +} + +void URLFetcher::set_extra_request_headers( + const std::string& extra_request_headers) { + core_->extra_request_headers_ = extra_request_headers; +} + +void URLFetcher::set_request_context(URLRequestContext* request_context) { + core_->request_context_ = request_context; +} + +net::HttpResponseHeaders* URLFetcher::response_headers() const { + return core_->response_headers_; +} + +void URLFetcher::Start() { + core_->Start(); +} + +const GURL& URLFetcher::url() const { + return core_->url_; +} diff --git a/chrome/browser/net/url_fetcher.h b/chrome/browser/net/url_fetcher.h index 044e61b..5485d7f 100644 --- a/chrome/browser/net/url_fetcher.h +++ b/chrome/browser/net/url_fetcher.h @@ -7,15 +7,22 @@ // reading. This is useful for callers who simply want to get the data from a // URL and don't care about all the nitty-gritty details. -#ifndef CHROME_BROWSER_URL_FETCHER_H__ -#define CHROME_BROWSER_URL_FETCHER_H__ +#ifndef CHROME_BROWSER_URL_FETCHER_H_ +#define CHROME_BROWSER_URL_FETCHER_H_ #include "base/message_loop.h" #include "base/ref_counted.h" #include "chrome/browser/net/url_fetcher_protect.h" -#include "net/url_request/url_request.h" +class GURL; +typedef std::vector<std::string> ResponseCookies; +class URLFetcher; class URLRequestContext; +class URLRequestStatus; + +namespace net { +class HttpResponseHeaders; +} // To use this class, create an instance with the desired URL and a pointer to // the object to be notified when the URL has been loaded: @@ -74,59 +81,44 @@ class URLFetcher { // |d| the object that will receive the callback on fetch completion. URLFetcher(const GURL& url, RequestType request_type, Delegate* d); + ~URLFetcher(); + // This should only be used by unittests, where g_browser_process->io_thread() // does not exist and we must specify an alternate loop. Unfortunately, we // can't put it under #ifdef UNIT_TEST since some callers (which themselves // should only be reached in unit tests) use this. See // chrome/browser/feeds/feed_manager.cc. - void set_io_loop(MessageLoop* io_loop) { - core_->io_loop_ = io_loop; - } + void set_io_loop(MessageLoop* io_loop); // Sets data only needed by POSTs. All callers making POST requests should // call this before the request is started. |upload_content_type| is the MIME // type of the content, while |upload_content| is the data to be sent (the // Content-Length header value will be set to the length of this data). void set_upload_data(const std::string& upload_content_type, - const std::string& upload_content) { - core_->upload_content_type_ = upload_content_type; - core_->upload_content_ = upload_content; - } + const std::string& upload_content); // Set one or more load flags as defined in net/base/load_flags.h. Must be // called before the request is started. - void set_load_flags(int load_flags) { - core_->load_flags_ = load_flags; - } + void set_load_flags(int load_flags); // Set extra headers on the request. Must be called before the request // is started. - void set_extra_request_headers(const std::string& extra_request_headers) { - core_->extra_request_headers_ = extra_request_headers; - } + void set_extra_request_headers(const std::string& extra_request_headers); // Set the URLRequestContext on the request. Must be called before the // request is started. - void set_request_context(URLRequestContext* request_context) { - core_->request_context_ = request_context; - } + void set_request_context(URLRequestContext* request_context); // Retrieve the response headers from the request. Must only be called after // the OnURLFetchComplete callback has run. - net::HttpResponseHeaders* response_headers() const { - return core_->response_headers_; - } + net::HttpResponseHeaders* response_headers() const; // Start the request. After this is called, you may not change any other // settings. - void Start() { core_->Start(); } + void Start(); // Return the URL that this fetcher is processing. - const GURL& url() const { - return core_->url_; - } - - ~URLFetcher(); + const GURL& url() const; private: // This class is the real guts of URLFetcher. @@ -137,84 +129,11 @@ class URLFetcher { // thread (since that class is not currently threadsafe and relies on // underlying Microsoft APIs that we don't know to be threadsafe), while // keeping the delegate callback on the delegate's thread. - class Core : public base::RefCountedThreadSafe<URLFetcher::Core>, - public URLRequest::Delegate { - public: - // For POST requests, set |content_type| to the MIME type of the content - // and set |content| to the data to upload. |flags| are flags to apply to - // the load operation--these should be one or more of the LOAD_* flags - // defined in url_request.h. - Core(URLFetcher* fetcher, - const GURL& original_url, - RequestType request_type, - URLFetcher::Delegate* d); - - // Starts the load. It's important that this not happen in the constructor - // because it causes the IO thread to begin AddRef()ing and Release()ing - // us. If our caller hasn't had time to fully construct us and take a - // reference, the IO thread could interrupt things, run a task, Release() - // us, and destroy us, leaving the caller with an already-destroyed object - // when construction finishes. - void Start(); - - // Stops any in-progress load and ensures no callback will happen. It is - // safe to call this multiple times. - void Stop(); - - // URLRequest::Delegate implementations - virtual void OnReceivedRedirect(URLRequest* request, - const GURL& new_url) { } - virtual void OnResponseStarted(URLRequest* request); - virtual void OnReadCompleted(URLRequest* request, int bytes_read); - - private: - // Wrapper functions that allow us to ensure actions happen on the right - // thread. - void StartURLRequest(); - void CancelURLRequest(); - void OnCompletedURLRequest(const URLRequestStatus& status); - - URLFetcher* fetcher_; // Corresponding fetcher object - GURL original_url_; // The URL we were asked to fetch - GURL url_; // The URL we eventually wound up at - RequestType request_type_; // What type of request is this? - URLFetcher::Delegate* delegate_; // Object to notify on completion - MessageLoop* delegate_loop_; // Message loop of the creating thread - MessageLoop* io_loop_; // Message loop of the IO thread - URLRequest* request_; // The actual request this wraps - int load_flags_; // Flags for the load operation - int response_code_; // HTTP status code for the request - std::string data_; // Results of the request - scoped_refptr<net::IOBuffer> buffer_; - // Read buffer - scoped_refptr<URLRequestContext> request_context_; - // Cookie/cache info for the request - ResponseCookies cookies_; // Response cookies - std::string extra_request_headers_;// Extra headers for the request, if any - scoped_refptr<net::HttpResponseHeaders> response_headers_; - - std::string upload_content_; // HTTP POST payload - std::string upload_content_type_; // MIME type of POST payload - - // The overload protection entry for this URL. This is used to - // incrementally back off how rapidly we'll send requests to a particular - // URL, to avoid placing too much demand on the remote resource. We update - // this with the status of all requests as they return, and in turn use it - // to determine how long to wait before making another request. - URLFetcherProtectEntry* protect_entry_; - // |num_retries_| indicates how many times we've failed to successfully - // fetch this URL. Once this value exceeds the maximum number of retries - // specified by the protection manager, we'll give up. - int num_retries_; - - friend class URLFetcher; - DISALLOW_EVIL_CONSTRUCTORS(Core); - }; + class Core; scoped_refptr<Core> core_; DISALLOW_EVIL_CONSTRUCTORS(URLFetcher); }; -#endif // CHROME_BROWSER_URL_FETCHER_H__ - +#endif // CHROME_BROWSER_URL_FETCHER_H_ diff --git a/chrome/browser/net/url_fetcher_unittest.cc b/chrome/browser/net/url_fetcher_unittest.cc index 03b40d7..6a6e3ff 100644 --- a/chrome/browser/net/url_fetcher_unittest.cc +++ b/chrome/browser/net/url_fetcher_unittest.cc @@ -8,6 +8,7 @@ #include "chrome/browser/net/url_fetcher_protect.h" #include "chrome/common/chrome_plugin_lib.h" #include "net/base/ssl_test_util.h" +#include "net/http/http_response_headers.h" #include "net/url_request/url_request_unittest.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/plugin_process_host.cc b/chrome/browser/plugin_process_host.cc index 03a59ba..5cafff1 100644 --- a/chrome/browser/plugin_process_host.cc +++ b/chrome/browser/plugin_process_host.cc @@ -37,6 +37,7 @@ #include "net/base/cookie_monster.h" #include "net/base/io_buffer.h" #include "net/url_request/url_request.h" +#include "net/url_request/url_request_context.h" #include "sandbox/src/sandbox.h" #include "webkit/glue/plugins/plugin_constants_win.h" diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc index 0602de7..66f75d8 100644 --- a/chrome/browser/profile.cc +++ b/chrome/browser/profile.cc @@ -30,11 +30,8 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" -#include "chrome/common/pref_service.h" #include "chrome/common/render_messages.h" -#include "chrome/common/resource_bundle.h" #include "grit/locale_settings.h" -#include "net/url_request/url_request_context.h" #if defined(OS_POSIX) // TODO(port): get rid of this include. It's used just to provide declarations diff --git a/chrome/browser/profile_manager.cc b/chrome/browser/profile_manager.cc index 7698f62..f93c5a9 100644 --- a/chrome/browser/profile_manager.cc +++ b/chrome/browser/profile_manager.cc @@ -19,6 +19,7 @@ #include "chrome/common/logging_chrome.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" +#include "net/http/http_transaction_factory.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_job.h" #include "net/url_request/url_request_job_tracker.h" diff --git a/chrome/browser/renderer_host/buffered_resource_handler.cc b/chrome/browser/renderer_host/buffered_resource_handler.cc index 66ef1f3..515b497 100644 --- a/chrome/browser/renderer_host/buffered_resource_handler.cc +++ b/chrome/browser/renderer_host/buffered_resource_handler.cc @@ -5,11 +5,13 @@ #include "chrome/browser/renderer_host/buffered_resource_handler.h" #include "base/histogram.h" +#include "base/string_util.h" #include "net/base/mime_sniffer.h" #include "chrome/browser/renderer_host/download_throttling_resource_handler.h" #include "chrome/browser/renderer_host/resource_dispatcher_host.h" #include "net/base/mime_sniffer.h" #include "net/base/io_buffer.h" +#include "net/http/http_response_headers.h" namespace { diff --git a/chrome/browser/renderer_host/buffered_resource_handler.h b/chrome/browser/renderer_host/buffered_resource_handler.h index a612722..97907b5 100644 --- a/chrome/browser/renderer_host/buffered_resource_handler.h +++ b/chrome/browser/renderer_host/buffered_resource_handler.h @@ -10,6 +10,7 @@ #include "chrome/browser/renderer_host/resource_handler.h" class ResourceDispatcherHost; +class URLRequest; // Used to buffer a request until enough data has been received. class BufferedResourceHandler : public ResourceHandler { diff --git a/chrome/browser/renderer_host/download_throttling_resource_handler.h b/chrome/browser/renderer_host/download_throttling_resource_handler.h index 80c5a00..f280841 100644 --- a/chrome/browser/renderer_host/download_throttling_resource_handler.h +++ b/chrome/browser/renderer_host/download_throttling_resource_handler.h @@ -19,6 +19,7 @@ class DownloadResourceHandler; class ResourceDispatcherHost; +class URLRequest; // DownloadThrottlingResourceHandler is used to determine if a download should // be allowed. When a DownloadThrottlingResourceHandler is created it pauses the diff --git a/chrome/browser/renderer_host/render_process_host.h b/chrome/browser/renderer_host/render_process_host.h index acb7a83..8b90b3d 100644 --- a/chrome/browser/renderer_host/render_process_host.h +++ b/chrome/browser/renderer_host/render_process_host.h @@ -5,7 +5,8 @@ #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_PROCESS_HOST_H_ #define CHROME_BROWSER_RENDERER_HOST_RENDER_PROCESS_HOST_H_ -#include "base/basictypes.h" +#include <set> + #include "base/id_map.h" #include "base/process.h" #include "base/scoped_ptr.h" diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.h b/chrome/browser/renderer_host/render_widget_host_view_win.h index ff80c83..02887c5 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_win.h +++ b/chrome/browser/renderer_host/render_widget_host_view_win.h @@ -10,16 +10,13 @@ #include <atlcrack.h> #include <atlmisc.h> -#include "base/basictypes.h" -#include "base/gfx/size.h" -#include "base/scoped_handle.h" -#include "base/shared_memory.h" #include "base/task.h" #include "chrome/browser/ime_input.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" #include "webkit/glue/webcursor.h" namespace gfx { +class Size; class Rect; } namespace IPC { diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.cc b/chrome/browser/renderer_host/resource_dispatcher_host.cc index 5c1bd26..2217a0e 100644 --- a/chrome/browser/renderer_host/resource_dispatcher_host.cc +++ b/chrome/browser/renderer_host/resource_dispatcher_host.cc @@ -4,10 +4,10 @@ // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading -#include <vector> - #include "chrome/browser/renderer_host/resource_dispatcher_host.h" +#include <vector> + #include "base/message_loop.h" #include "base/scoped_ptr.h" #include "base/time.h" diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.h b/chrome/browser/renderer_host/resource_dispatcher_host.h index 6dfdd6d..452798e 100644 --- a/chrome/browser/renderer_host/resource_dispatcher_host.h +++ b/chrome/browser/renderer_host/resource_dispatcher_host.h @@ -13,13 +13,9 @@ #define CHROME_BROWSER_RENDERER_HOST_RESOURCE_DISPATCHER_HOST_H_ #include <map> -#include <string> -#include <vector> -#include "base/logging.h" #include "base/observer_list.h" #include "base/process.h" -#include "base/ref_counted.h" #include "base/timer.h" #include "chrome/browser/renderer_host/resource_handler.h" #include "chrome/common/filter_policy.h" diff --git a/chrome/browser/renderer_host/resource_handler.h b/chrome/browser/renderer_host/resource_handler.h index 8973c77..01abcb5 100644 --- a/chrome/browser/renderer_host/resource_handler.h +++ b/chrome/browser/renderer_host/resource_handler.h @@ -12,13 +12,14 @@ #ifndef CHROME_BROWSER_RENDERER_HOST_RESOURCE_HANDLER_H_ #define CHROME_BROWSER_RENDERER_HOST_RESOURCE_HANDLER_H_ -#include "base/basictypes.h" -#include "base/ref_counted.h" #include "chrome/common/filter_policy.h" -#include "googleurl/src/gurl.h" -#include "net/url_request/url_request.h" +#include "net/url_request/url_request_status.h" #include "webkit/glue/resource_loader_bridge.h" +namespace net { +class IOBuffer; +} + // Parameters for a resource response header. struct ResourceResponseHead : webkit_glue::ResourceLoaderBridge::ResponseInfo { diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc index 41f593a..8616e29 100644 --- a/chrome/browser/renderer_host/resource_message_filter.cc +++ b/chrome/browser/renderer_host/resource_message_filter.cc @@ -24,6 +24,7 @@ #include "chrome/common/render_messages.h" #include "net/base/cookie_monster.h" #include "net/base/mime_util.h" +#include "net/url_request/url_request_context.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webplugin.h" diff --git a/chrome/browser/renderer_host/resource_request_details.h b/chrome/browser/renderer_host/resource_request_details.h index 40e3709e..0e36478 100644 --- a/chrome/browser/renderer_host/resource_request_details.h +++ b/chrome/browser/renderer_host/resource_request_details.h @@ -11,12 +11,12 @@ #include <string> -#include "base/basictypes.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" +class URLRequest; + #if defined(OS_WIN) // TODO(port): Move header to the above section when CertStore has been ported. #include "chrome/browser/cert_store.h" diff --git a/chrome/browser/renderer_host/save_file_resource_handler.cc b/chrome/browser/renderer_host/save_file_resource_handler.cc index 139f5a00..c464664 100644 --- a/chrome/browser/renderer_host/save_file_resource_handler.cc +++ b/chrome/browser/renderer_host/save_file_resource_handler.cc @@ -10,6 +10,7 @@ #include "chrome/browser/download/save_file_manager.h" #endif +#include "base/string_util.h" #include "net/base/io_buffer.h" SaveFileResourceHandler::SaveFileResourceHandler(int render_process_host_id, @@ -89,3 +90,8 @@ bool SaveFileResourceHandler::OnResponseCompleted( read_buffer_ = NULL; return true; } + +void SaveFileResourceHandler::set_content_length( + const std::string& content_length) { + content_length_ = StringToInt64(content_length); +} diff --git a/chrome/browser/renderer_host/save_file_resource_handler.h b/chrome/browser/renderer_host/save_file_resource_handler.h index 63d78ad..03f4a02 100644 --- a/chrome/browser/renderer_host/save_file_resource_handler.h +++ b/chrome/browser/renderer_host/save_file_resource_handler.h @@ -39,9 +39,7 @@ class SaveFileResourceHandler : public ResourceHandler { // If the content-length header is not present (or contains something other // than numbers), StringToInt64 returns 0, which indicates 'unknown size' and // is handled correctly by the SaveManager. - void set_content_length(const std::string& content_length) { - content_length_ = StringToInt64(content_length); - } + void set_content_length(const std::string& content_length); void set_content_disposition(const std::string& content_disposition) { content_disposition_ = content_disposition; @@ -62,4 +60,5 @@ class SaveFileResourceHandler : public ResourceHandler { DISALLOW_COPY_AND_ASSIGN(SaveFileResourceHandler); }; + #endif // CHROME_BROWSER_RENDERER_HOST_SAVE_FILE_RESOURCE_HANDLER_H_ diff --git a/chrome/browser/safe_browsing/protocol_manager.h b/chrome/browser/safe_browsing/protocol_manager.h index 55c430a..6198ed4 100644 --- a/chrome/browser/safe_browsing/protocol_manager.h +++ b/chrome/browser/safe_browsing/protocol_manager.h @@ -11,8 +11,6 @@ // The SafeBrowsingProtocolParser class to do the actual parsing. #include <deque> -#include <string> -#include <vector> #include "base/hash_tables.h" #include "base/scoped_ptr.h" @@ -22,12 +20,12 @@ #include "chrome/browser/safe_browsing/protocol_parser.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/safe_browsing/safe_browsing_util.h" -#include "net/url_request/url_request.h" #include "testing/gtest/include/gtest/gtest_prod.h" class MessageLoop; class Task; class Timer; +class URLRequestStatus; #if defined(COMPILER_GCC) // Allows us to use URLFetchers in a hash_map with gcc (MSVC is okay without diff --git a/chrome/browser/safe_browsing/safe_browsing_database.h b/chrome/browser/safe_browsing/safe_browsing_database.h index 72ed129..a2575eb 100644 --- a/chrome/browser/safe_browsing/safe_browsing_database.h +++ b/chrome/browser/safe_browsing/safe_browsing_database.h @@ -7,7 +7,7 @@ #include <deque> #include <list> -#include <string> +#include <set> #include <vector> #include "base/file_path.h" diff --git a/chrome/browser/search_engines/template_url_fetcher.cc b/chrome/browser/search_engines/template_url_fetcher.cc index 5727e2d..d5f043e 100644 --- a/chrome/browser/search_engines/template_url_fetcher.cc +++ b/chrome/browser/search_engines/template_url_fetcher.cc @@ -4,6 +4,7 @@ #include "chrome/browser/search_engines/template_url_fetcher.h" +#include "chrome/browser/net/url_fetcher.h" #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" @@ -11,6 +12,56 @@ #include "chrome/browser/views/edit_keyword_controller.h" // RequestDelegate ------------------------------------------------------------ +class TemplateURLFetcher::RequestDelegate : public URLFetcher::Delegate { + public: + RequestDelegate(TemplateURLFetcher* fetcher, + const std::wstring& keyword, + const GURL& osdd_url, + const GURL& favicon_url, + gfx::NativeView parent_window, + bool autodetected) +#pragma warning(disable:4355) + : url_fetcher_(osdd_url, URLFetcher::GET, this), + fetcher_(fetcher), + keyword_(keyword), + osdd_url_(osdd_url), + favicon_url_(favicon_url), + parent_window_(parent_window), + autodetected_(autodetected) { + url_fetcher_.set_request_context(fetcher->profile()->GetRequestContext()); + url_fetcher_.Start(); + } + + // If data contains a valid OSDD, a TemplateURL is created and added to + // the TemplateURLModel. + virtual void OnURLFetchComplete(const URLFetcher* source, + const GURL& url, + const URLRequestStatus& status, + int response_code, + const ResponseCookies& cookies, + const std::string& data); + + // URL of the OSDD. + const GURL& url() const { return osdd_url_; } + + // Keyword to use. + const std::wstring keyword() const { return keyword_; } + + private: + URLFetcher url_fetcher_; + TemplateURLFetcher* fetcher_; + const std::wstring keyword_; + const GURL osdd_url_; + const GURL favicon_url_; + bool autodetected_; + + // Used to determine where to place a confirmation dialog. May be NULL, + // in which case the confirmation will be centered in the screen if needed. + gfx::NativeView parent_window_; + + DISALLOW_COPY_AND_ASSIGN(RequestDelegate); +}; + void TemplateURLFetcher::RequestDelegate::OnURLFetchComplete( const URLFetcher* source, @@ -89,6 +140,9 @@ TemplateURLFetcher::TemplateURLFetcher(Profile* profile) : profile_(profile) { DCHECK(profile_); } +TemplateURLFetcher::~TemplateURLFetcher() { +} + void TemplateURLFetcher::ScheduleDownload(const std::wstring& keyword, const GURL& osdd_url, const GURL& favicon_url, diff --git a/chrome/browser/search_engines/template_url_fetcher.h b/chrome/browser/search_engines/template_url_fetcher.h index 7b429a7..dc042ba 100644 --- a/chrome/browser/search_engines/template_url_fetcher.h +++ b/chrome/browser/search_engines/template_url_fetcher.h @@ -6,8 +6,6 @@ #define CHROME_BROWSER_TEMPLATE_URL_FETCHER_H_ #include "base/gfx/native_widget_types.h" -#include "chrome/browser/net/url_fetcher.h" -#include "chrome/browser/profile.h" #include "chrome/common/scoped_vector.h" class GURL; @@ -23,6 +21,7 @@ class TemplateURLFetcher { public: // Creates a TemplateURLFetcher with the specified Profile. explicit TemplateURLFetcher(Profile* profile); + ~TemplateURLFetcher(); // If TemplateURLFetcher is not already downloading the OSDD for osdd_url, // it is downloaded. If successful and the result can be parsed, a TemplateURL @@ -38,55 +37,7 @@ class TemplateURLFetcher { // A RequestDelegate is created to download each OSDD. When done downloading // RequestCompleted is invoked back on the TemplateURLFetcher. - class RequestDelegate : public URLFetcher::Delegate { - public: - RequestDelegate(TemplateURLFetcher* fetcher, - const std::wstring& keyword, - const GURL& osdd_url, - const GURL& favicon_url, - gfx::NativeView parent_window, - bool autodetected) -#pragma warning(disable:4355) - : url_fetcher_(osdd_url, URLFetcher::GET, this), - fetcher_(fetcher), - keyword_(keyword), - osdd_url_(osdd_url), - favicon_url_(favicon_url), - parent_window_(parent_window), - autodetected_(autodetected) { - url_fetcher_.set_request_context(fetcher->profile()->GetRequestContext()); - url_fetcher_.Start(); - } - - // If data contains a valid OSDD, a TemplateURL is created and added to - // the TemplateURLModel. - virtual void OnURLFetchComplete(const URLFetcher* source, - const GURL& url, - const URLRequestStatus& status, - int response_code, - const ResponseCookies& cookies, - const std::string& data); - - // URL of the OSDD. - const GURL& url() const { return osdd_url_; } - - // Keyword to use. - const std::wstring keyword() const { return keyword_; } - - private: - URLFetcher url_fetcher_; - TemplateURLFetcher* fetcher_; - const std::wstring keyword_; - const GURL osdd_url_; - const GURL favicon_url_; - bool autodetected_; - - // Used to determine where to place a confirmation dialog. May be NULL, - // in which case the confirmation will be centered in the screen if needed. - gfx::NativeView parent_window_; - - DISALLOW_COPY_AND_ASSIGN(RequestDelegate); - }; + class RequestDelegate; Profile* profile() const { return profile_; } diff --git a/chrome/browser/views/blocked_popup_container.cc b/chrome/browser/views/blocked_popup_container.cc index bde9f3a..1426ba8 100644 --- a/chrome/browser/views/blocked_popup_container.cc +++ b/chrome/browser/views/blocked_popup_container.cc @@ -12,6 +12,7 @@ #include <math.h> +#include "base/string_util.h" #include "grit/theme_resources.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index 2de1bf4..6832ddc 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -6,6 +6,7 @@ #include <limits> +#include "base/string_util.h" #include "base/base_drag_source.h" #include "grit/theme_resources.h" #include "chrome/browser/bookmarks/bookmark_context_menu.h" diff --git a/chrome/browser/views/bug_report_view.h b/chrome/browser/views/bug_report_view.h index 9ee7733..3f2d8a3 100644 --- a/chrome/browser/views/bug_report_view.h +++ b/chrome/browser/views/bug_report_view.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_VIEWS_BUGREPORT_VIEW_H__ -#define CHROME_BROWSER_VIEWS_BUGREPORT_VIEW_H__ +#ifndef CHROME_BROWSER_VIEWS_BUGREPORT_VIEW_H_ +#define CHROME_BROWSER_VIEWS_BUGREPORT_VIEW_H_ #include "chrome/browser/net/url_fetcher.h" #include "chrome/views/combo_box.h" @@ -11,6 +11,7 @@ #include "chrome/views/native_button.h" #include "chrome/views/text_field.h" #include "chrome/views/view.h" +#include "googleurl/src/gurl.h" namespace views { class CheckBox; @@ -123,5 +124,4 @@ class BugReportView : public views::View, DISALLOW_EVIL_CONSTRUCTORS(BugReportView); }; -#endif // CHROME_BROWSER_VIEWS_BUGREPORT_VIEW_H__ - +#endif // CHROME_BROWSER_VIEWS_BUGREPORT_VIEW_H_ diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc index ac20ed1..898db6f 100644 --- a/chrome/browser/views/options/advanced_contents_view.cc +++ b/chrome/browser/views/options/advanced_contents_view.cc @@ -42,6 +42,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "net/base/ssl_config_service.h" +#include "net/base/cookie_policy.h" using views::GridLayout; using views::ColumnSet; diff --git a/chrome/browser/views/shell_dialogs_win.cc b/chrome/browser/views/shell_dialogs_win.cc index be3da01..ec3a92e 100644 --- a/chrome/browser/views/shell_dialogs_win.cc +++ b/chrome/browser/views/shell_dialogs_win.cc @@ -5,12 +5,12 @@ #include "chrome/browser/shell_dialogs.h" #include <windows.h> -#include <Commdlg.h> +#include <commdlg.h> #include <shlobj.h> -#include <atlbase.h> +//#include <atlbase.h> #include <algorithm> -#include <map> +#include <set> #include "base/file_util.h" #include "base/registry.h" diff --git a/chrome/common/child_process_info.h b/chrome/common/child_process_info.h index fff0959..eee468d 100644 --- a/chrome/common/child_process_info.h +++ b/chrome/common/child_process_info.h @@ -7,7 +7,6 @@ #include <string> -#include "base/basictypes.h" #include "base/process.h" // Holds information about a child process. diff --git a/chrome/common/chrome_plugin_unittest.cc b/chrome/common/chrome_plugin_unittest.cc index 795c43a..ef4aaf7 100644 --- a/chrome/common/chrome_plugin_unittest.cc +++ b/chrome/common/chrome_plugin_unittest.cc @@ -12,6 +12,7 @@ #include "chrome/common/chrome_plugin_lib.h" #include "chrome/test/chrome_plugin/test_chrome_plugin.h" #include "net/base/io_buffer.h" +#include "net/http/http_response_headers.h" #include "net/url_request/url_request_test_job.h" #include "net/url_request/url_request_unittest.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/chrome_plugin_util.h b/chrome/common/chrome_plugin_util.h index 0c80c8c..07f99e4 100644 --- a/chrome/common/chrome_plugin_util.h +++ b/chrome/common/chrome_plugin_util.h @@ -13,7 +13,7 @@ class ChromePluginLib; class MessageLoop; -namespace net{ +namespace net { class HttpResponseHeaders; } diff --git a/chrome/common/net/url_request_intercept_job.cc b/chrome/common/net/url_request_intercept_job.cc index 08da43a..81d1a78 100644 --- a/chrome/common/net/url_request_intercept_job.cc +++ b/chrome/common/net/url_request_intercept_job.cc @@ -13,6 +13,8 @@ #include "chrome/common/chrome_plugin_lib.h" #include "chrome/common/notification_service.h" #include "net/base/net_errors.h" +#include "net/http/http_response_headers.h" +#include "net/url_request/url_request.h" using base::Time; using base::TimeDelta; diff --git a/chrome/common/net/url_request_intercept_job.h b/chrome/common/net/url_request_intercept_job.h index 794a418..bc422af 100644 --- a/chrome/common/net/url_request_intercept_job.h +++ b/chrome/common/net/url_request_intercept_job.h @@ -2,11 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_COMMON_NET_URL_REQUEST_INTERCEPT_JOB_H__ -#define CHROME_COMMON_NET_URL_REQUEST_INTERCEPT_JOB_H__ +#ifndef CHROME_COMMON_NET_URL_REQUEST_INTERCEPT_JOB_H_ +#define CHROME_COMMON_NET_URL_REQUEST_INTERCEPT_JOB_H_ -#include "base/basictypes.h" -#include "net/url_request/url_request.h" #include "net/url_request/url_request_job.h" #include "chrome/browser/chrome_plugin_host.h" #include "chrome/common/chrome_plugin_api.h" @@ -14,6 +12,7 @@ #include "chrome/common/notification_observer.h" class ChromePluginLib; +class URLRequest; // A request job that handles network requests intercepted by a Chrome plugin. class URLRequestInterceptJob @@ -56,9 +55,7 @@ class URLRequestInterceptJob net::IOBuffer* read_buffer_; int read_buffer_size_; - DISALLOW_EVIL_CONSTRUCTORS(URLRequestInterceptJob); + DISALLOW_COPY_AND_ASSIGN(URLRequestInterceptJob); }; - -#endif // CHROME_COMMON_NET_URL_REQUEST_INTERCEPT_JOB_H__ - +#endif // CHROME_COMMON_NET_URL_REQUEST_INTERCEPT_JOB_H_ diff --git a/chrome/common/pref_service.h b/chrome/common/pref_service.h index cb81467..8cc375f 100644 --- a/chrome/common/pref_service.h +++ b/chrome/common/pref_service.h @@ -15,9 +15,8 @@ #ifndef CHROME_COMMON_PREF_SERVICE_H_ #define CHROME_COMMON_PREF_SERVICE_H_ -#include <string> +#include <set> -#include "base/basictypes.h" #include "base/hash_tables.h" #include "base/non_thread_safe.h" #include "base/observer_list.h" diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h index c96d787..c814b84 100644 --- a/chrome/common/render_messages.h +++ b/chrome/common/render_messages.h @@ -23,6 +23,7 @@ #include "googleurl/src/gurl.h" #include "media/audio/audio_output.h" #include "net/base/upload_data.h" +#include "net/http/http_response_headers.h" #include "net/url_request/url_request_status.h" #include "webkit/glue/autofill_form.h" #include "webkit/glue/cache_manager.h" diff --git a/chrome/plugin/chrome_plugin_host.cc b/chrome/plugin/chrome_plugin_host.cc index 9343cae..159d4b2 100644 --- a/chrome/plugin/chrome_plugin_host.cc +++ b/chrome/plugin/chrome_plugin_host.cc @@ -17,6 +17,7 @@ #include "chrome/plugin/webplugin_proxy.h" #include "net/base/data_url.h" #include "net/base/upload_data.h" +#include "net/http/http_response_headers.h" #include "webkit/glue/plugins/plugin_instance.h" #include "webkit/glue/resource_loader_bridge.h" #include "webkit/glue/resource_type.h" diff --git a/chrome/plugin/plugin.vcproj b/chrome/plugin/plugin.vcproj index 008a702..fadc40c 100644 --- a/chrome/plugin/plugin.vcproj +++ b/chrome/plugin/plugin.vcproj @@ -204,6 +204,14 @@ UsePrecompiledHeader="1" /> </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCLCompilerTool" + /> + </FileConfiguration> </File> <File RelativePath="..\tools\build\win\precompiled.h" diff --git a/media/base/buffers.h b/media/base/buffers.h index 5b9cea2..b6c3935 100644 --- a/media/base/buffers.h +++ b/media/base/buffers.h @@ -27,7 +27,6 @@ #ifndef MEDIA_BASE_BUFFERS_H_ #define MEDIA_BASE_BUFFERS_H_ -#include "base/basictypes.h" #include "base/logging.h" #include "base/ref_counted.h" #include "base/time.h" diff --git a/net/base/client_socket.cc b/net/base/client_socket.cc new file mode 100644 index 0000000..4c607fa --- /dev/null +++ b/net/base/client_socket.cc @@ -0,0 +1,22 @@ +// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "net/base/client_socket.h" + +#include "base/logging.h" +#include "net/base/net_errors.h" + +namespace net { + +#if defined(OS_LINUX) +// Identical to posix system call getpeername(). +// Needed by ssl_client_socket_nss. +int ClientSocket::GetPeerName(struct sockaddr *name, socklen_t *namelen) { + // Default implementation just permits some unit tests to link. + NOTREACHED(); + return ERR_UNEXPECTED; +} +#endif + +} // namespace net diff --git a/net/base/client_socket.h b/net/base/client_socket.h index 97495dd..b96f07b 100644 --- a/net/base/client_socket.h +++ b/net/base/client_socket.h @@ -5,9 +5,13 @@ #ifndef NET_BASE_CLIENT_SOCKET_H_ #define NET_BASE_CLIENT_SOCKET_H_ -#include "base/logging.h" +#include "build/build_config.h" + +#if defined(OS_LINUX) +#include <sys/socket.h> +#endif + #include "net/base/socket.h" -#include "net/base/net_errors.h" namespace net { @@ -46,11 +50,7 @@ class ClientSocket : public Socket { #if defined(OS_LINUX) // Identical to posix system call getpeername(). // Needed by ssl_client_socket_nss. - virtual int GetPeerName(struct sockaddr *name, socklen_t *namelen) { - // Default implementation just permits some unit tests to link. - NOTREACHED(); - return ERR_UNEXPECTED; - } + virtual int GetPeerName(struct sockaddr *name, socklen_t *namelen); #endif }; diff --git a/net/base/io_buffer.cc b/net/base/io_buffer.cc new file mode 100644 index 0000000..c9b4532 --- /dev/null +++ b/net/base/io_buffer.cc @@ -0,0 +1,16 @@ +// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "net/base/io_buffer.h" + +#include "base/logging.h" + +namespace net { + +IOBuffer::IOBuffer(int buffer_size) { + DCHECK(buffer_size); + data_ = new char[buffer_size]; +} + +} // namespace net diff --git a/net/base/io_buffer.h b/net/base/io_buffer.h index 88066c2..48d69d6 100644 --- a/net/base/io_buffer.h +++ b/net/base/io_buffer.h @@ -5,7 +5,6 @@ #ifndef NET_BASE_IO_BUFFER_H_ #define NET_BASE_IO_BUFFER_H_ -#include "base/logging.h" #include "base/ref_counted.h" namespace net { @@ -15,10 +14,7 @@ namespace net { class IOBuffer : public base::RefCountedThreadSafe<IOBuffer> { public: IOBuffer() : data_(NULL) {} - explicit IOBuffer(int buffer_size) { - DCHECK(buffer_size); - data_ = new char[buffer_size]; - } + explicit IOBuffer(int buffer_size); explicit IOBuffer(char* data) : data_(data) {} virtual ~IOBuffer() { delete[] data_; diff --git a/net/base/upload_data.h b/net/base/upload_data.h index 04e1529..3174b77 100644 --- a/net/base/upload_data.h +++ b/net/base/upload_data.h @@ -2,13 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_UPLOAD_DATA_H__ -#define NET_BASE_UPLOAD_DATA_H__ +#ifndef NET_BASE_UPLOAD_DATA_H_ +#define NET_BASE_UPLOAD_DATA_H_ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/ref_counted.h" namespace net { @@ -98,5 +97,4 @@ class UploadData : public base::RefCounted<UploadData> { } // namespace net -#endif // NET_BASE_UPLOAD_DATA_H__ - +#endif // NET_BASE_UPLOAD_DATA_H_ diff --git a/net/build/net.vcproj b/net/build/net.vcproj index 073c377..dac85da 100644 --- a/net/build/net.vcproj +++ b/net/build/net.vcproj @@ -14,7 +14,7 @@ </Platforms> <ToolFiles> <ToolFile - RelativePath="convert_tld_data.rules" + RelativePath=".\convert_tld_data.rules" /> </ToolFiles> <Configurations> @@ -185,6 +185,10 @@ > </File> <File + RelativePath="..\base\client_socket.cc" + > + </File> + <File RelativePath="..\base\client_socket.h" > </File> @@ -325,6 +329,10 @@ > </File> <File + RelativePath="..\base\io_buffer.cc" + > + </File> + <File RelativePath="..\base\io_buffer.h" > </File> @@ -789,6 +797,10 @@ > </File> <File + RelativePath="..\http\http_response_info.cc" + > + </File> + <File RelativePath="..\http\http_response_info.h" > </File> @@ -821,6 +833,10 @@ Name="disk_cache" > <File + RelativePath="..\disk_cache\addr.cc" + > + </File> + <File RelativePath="..\disk_cache\addr.h" > </File> diff --git a/net/disk_cache/addr.cc b/net/disk_cache/addr.cc new file mode 100644 index 0000000..aa84c01 --- /dev/null +++ b/net/disk_cache/addr.cc @@ -0,0 +1,29 @@ +// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "net/disk_cache/addr.h" + +#include "base/logging.h" + +namespace disk_cache { + +int Addr::start_block() const { + DCHECK(is_block_file()); + return value_ & kStartBlockMask; +} + +int Addr::num_blocks() const { + DCHECK(is_block_file() || !value_); + return ((value_ & kNumBlocksMask) >> kNumBlocksOffset) + 1; +} + +bool Addr::SetFileNumber(int file_number) { + DCHECK(is_separate_file()); + if (file_number & ~kFileNameMask) + return false; + value_ = kInitializedMask | file_number; + return true; +} + +} // namespace disk_cache diff --git a/net/disk_cache/addr.h b/net/disk_cache/addr.h index 375b2c5..a504019 100644 --- a/net/disk_cache/addr.h +++ b/net/disk_cache/addr.h @@ -5,11 +5,9 @@ // This is an internal class that handles the address of a cache record. // See net/disk_cache/disk_cache.h for the public interface of the cache. -#ifndef NET_DISK_CACHE_ADDR_H__ -#define NET_DISK_CACHE_ADDR_H__ +#ifndef NET_DISK_CACHE_ADDR_H_ +#define NET_DISK_CACHE_ADDR_H_ -#include "base/basictypes.h" -#include "base/logging.h" #include "net/disk_cache/disk_format.h" namespace disk_cache { @@ -87,24 +85,9 @@ class Addr { return ((value_ & kFileSelectorMask) >> kFileSelectorOffset); } - int start_block() const { - DCHECK(is_block_file()); - return value_ & kStartBlockMask; - } - - int num_blocks() const { - DCHECK(is_block_file() || !value_); - return ((value_ & kNumBlocksMask) >> kNumBlocksOffset) + 1; - } - - bool SetFileNumber(int file_number) { - DCHECK(is_separate_file()); - if (file_number & ~kFileNameMask) - return false; - value_ = kInitializedMask | file_number; - return true; - } - + int start_block() const; + int num_blocks() const; + bool SetFileNumber(int file_number); int BlockSize() const { return BlockSizeForFileType(file_type()); } @@ -151,5 +134,4 @@ class Addr { } // namespace disk_cache -#endif // NET_DISK_CACHE_ADDR_H__ - +#endif // NET_DISK_CACHE_ADDR_H_ diff --git a/net/disk_cache/rankings.h b/net/disk_cache/rankings.h index 1434235..d4c10afd 100644 --- a/net/disk_cache/rankings.h +++ b/net/disk_cache/rankings.h @@ -9,6 +9,7 @@ #include <list> +#include "base/scoped_ptr.h" #include "net/disk_cache/addr.h" #include "net/disk_cache/mapped_file.h" #include "net/disk_cache/storage_block.h" diff --git a/net/disk_cache/storage_block-inl.h b/net/disk_cache/storage_block-inl.h index 2082b0a..485a1b1 100644 --- a/net/disk_cache/storage_block-inl.h +++ b/net/disk_cache/storage_block-inl.h @@ -2,11 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_DISK_CACHE_CACHE_INTERNAL_INL_H__ -#define NET_DISK_CACHE_CACHE_INTERNAL_INL_H__ +#ifndef NET_DISK_CACHE_CACHE_INTERNAL_INL_H_ +#define NET_DISK_CACHE_CACHE_INTERNAL_INL_H_ #include "net/disk_cache/storage_block.h" +#include "base/logging.h" #include "net/disk_cache/trace.h" namespace disk_cache { @@ -132,5 +133,4 @@ template<typename T> void StorageBlock<T>::DeleteData() { } // namespace disk_cache -#endif // NET_DISK_CACHE_CACHE_INTERNAL_INL_H__ - +#endif // NET_DISK_CACHE_CACHE_INTERNAL_INL_H_ diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc index bf42584..6245920 100644 --- a/net/http/http_cache.cc +++ b/net/http/http_cache.cc @@ -18,6 +18,7 @@ #include "net/disk_cache/disk_cache.h" #include "net/http/http_network_layer.h" #include "net/http/http_request_info.h" +#include "net/http/http_response_headers.h" #include "net/http/http_response_info.h" #include "net/http/http_transaction.h" #include "net/http/http_util.h" diff --git a/net/http/http_cache.h b/net/http/http_cache.h index 63e5257..51991f5 100644 --- a/net/http/http_cache.h +++ b/net/http/http_cache.h @@ -15,7 +15,7 @@ #define NET_HTTP_HTTP_CACHE_H_ #include <list> -#include <string> +#include <set> #include "base/basictypes.h" #include "base/hash_tables.h" diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc index fb9489c..f7aeff6 100644 --- a/net/http/http_network_transaction.cc +++ b/net/http/http_network_transaction.cc @@ -23,6 +23,7 @@ #include "net/http/http_chunked_decoder.h" #include "net/http/http_network_session.h" #include "net/http/http_request_info.h" +#include "net/http/http_response_headers.h" #include "net/http/http_util.h" using base::Time; diff --git a/net/http/http_response_info.cc b/net/http/http_response_info.cc new file mode 100644 index 0000000..ad6ef87 --- /dev/null +++ b/net/http/http_response_info.cc @@ -0,0 +1,17 @@ +// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "net/http/http_response_info.h" + +#include "net/http/http_response_headers.h" + +namespace net { + +HttpResponseInfo::HttpResponseInfo() { +} + +HttpResponseInfo::~HttpResponseInfo() { +} + +} // namespace net diff --git a/net/http/http_response_info.h b/net/http/http_response_info.h index 5563ada..671a390 100644 --- a/net/http/http_response_info.h +++ b/net/http/http_response_info.h @@ -2,19 +2,23 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_HTTP_HTTP_RESPONSE_INFO_H__ -#define NET_HTTP_HTTP_RESPONSE_INFO_H__ +#ifndef NET_HTTP_HTTP_RESPONSE_INFO_H_ +#define NET_HTTP_HTTP_RESPONSE_INFO_H_ #include "base/time.h" #include "net/base/auth.h" #include "net/base/ssl_info.h" -#include "net/http/http_response_headers.h" #include "net/http/http_vary_data.h" namespace net { +class HttpResponseHeaders; + class HttpResponseInfo { public: + HttpResponseInfo(); + ~HttpResponseInfo(); + // The following is only defined if the request_time memmber is set. // If this response was resurrected from cache, then this bool is set, and // request_time may corresponds to a time "far" in the past. Note that @@ -48,5 +52,4 @@ class HttpResponseInfo { } // namespace net -#endif // NET_HTTP_HTTP_RESPONSE_INFO_H__ - +#endif // NET_HTTP_HTTP_RESPONSE_INFO_H_ diff --git a/net/http/http_transaction_unittest.h b/net/http/http_transaction_unittest.h index 9ef6bf8..e530423 100644 --- a/net/http/http_transaction_unittest.h +++ b/net/http/http_transaction_unittest.h @@ -20,6 +20,7 @@ #include "net/disk_cache/disk_cache.h" #include "net/http/http_cache.h" #include "net/http/http_request_info.h" +#include "net/http/http_response_headers.h" #include "net/http/http_response_info.h" //----------------------------------------------------------------------------- diff --git a/net/net.xcodeproj/project.pbxproj b/net/net.xcodeproj/project.pbxproj index 37df32e..553c9db 100644 --- a/net/net.xcodeproj/project.pbxproj +++ b/net/net.xcodeproj/project.pbxproj @@ -52,6 +52,7 @@ 04C626D80E8DE3AA0067E92A /* http_auth_handler_basic_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04C626D70E8DE3AA0067E92A /* http_auth_handler_basic_unittest.cc */; }; 04C626DA0E8DE3BA0067E92A /* http_auth_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04C626D90E8DE3BA0067E92A /* http_auth_unittest.cc */; }; 04E7BD550EC4ECF60078FE58 /* http_auth_cache.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04E7BD540EC4ECF60078FE58 /* http_auth_cache.cc */; }; + 3853286C2A6C0BE6E1113FA2 /* client_socket.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2C481A2E21097E841607B968 /* client_socket.cc */; }; 4D4C5BE20EF1B89E002CA805 /* directory_lister_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED325A0E5A181C00A747DB /* directory_lister_unittest.cc */; }; 4D4C5C060EF1B8C5002CA805 /* filter_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D4C5C050EF1B8C5002CA805 /* filter_unittest.cc */; }; 4D4C5C070EF1B915002CA805 /* http_cache_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED33550E5A194700A747DB /* http_cache_unittest.cc */; }; @@ -134,6 +135,7 @@ 7BED34190E5A1A8600A747DB /* libnet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E4BA04540E25613300BE02C6 /* libnet.a */; }; 7BED34450E5A1A9600A747DB /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BED324A0E5A17C000A747DB /* libbase.a */; }; 7BED34520E5A1ABC00A747DB /* libgtest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BED32530E5A17C300A747DB /* libgtest.a */; }; + 81C766A4F7089E3ED5BD33A4 /* addr.cc in Sources */ = {isa = PBXBuildFile; fileRef = D7745B2B51F48114C05EB14A /* addr.cc */; }; 8200F2030E5F741E005A3C44 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8200F2020E5F741E005A3C44 /* CoreServices.framework */; }; 820701040EB6611F005CD9E7 /* proxy_resolver_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = 820701020EB6611F005CD9E7 /* proxy_resolver_mac.cc */; }; 820706940EB8D9D4005CD9E7 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 820706930EB8D9D4005CD9E7 /* SystemConfiguration.framework */; }; @@ -159,6 +161,7 @@ 827E139D0E81611D00183614 /* x509_certificate_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED32800E5A181C00A747DB /* x509_certificate_mac.cc */; }; 82ECB3090E5B651D00A913E3 /* mime_sniffer.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED32AD0E5A181C00A747DB /* mime_sniffer.cc */; }; 93D11DCE0E91463000C36437 /* file_stream_posix.cc in Sources */ = {isa = PBXBuildFile; fileRef = 93D11DCD0E91463000C36437 /* file_stream_posix.cc */; }; + A2420E59B0E92F1C5DF8FE67 /* io_buffer.cc in Sources */ = {isa = PBXBuildFile; fileRef = D67E592A64772BE82718FD4C /* io_buffer.cc */; }; A50055BF0EBF7CB2007B0A90 /* telnet_server_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED328B0E5A181C00A747DB /* telnet_server_unittest.cc */; }; A50055C00EBF7CD6007B0A90 /* listen_socket_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED32B10E5A181C00A747DB /* listen_socket_unittest.cc */; }; A50055FE0EBF800D007B0A90 /* telnet_server.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED328D0E5A181C00A747DB /* telnet_server.cc */; }; @@ -186,6 +189,7 @@ E4CE9C260E8C027900D5378C /* http_network_layer_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED335C0E5A194700A747DB /* http_network_layer_unittest.cc */; }; E4CE9C2E0E8C02ED00D5378C /* http_transaction_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED334A0E5A194700A747DB /* http_transaction_unittest.cc */; }; E4CE9C380E8C035C00D5378C /* http_network_transaction_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED33590E5A194700A747DB /* http_network_transaction_unittest.cc */; }; + E51639B07E0FC884891C5135 /* http_response_info.cc in Sources */ = {isa = PBXBuildFile; fileRef = AD46F9C0118A7D723526A361 /* http_response_info.cc */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -442,6 +446,7 @@ 04E7BD560EC4ED020078FE58 /* http_auth_cache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = http_auth_cache.h; sourceTree = "<group>"; }; 0E81748E2B2E8B814DBB78EC /* ftp_auth_cache.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ftp_auth_cache.cc; path = ftp/ftp_auth_cache.cc; sourceTree = SOURCE_ROOT; }; 15C6370BF6FE62308A559648 /* ftp_auth_cache_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ftp_auth_cache_unittest.cc; path = ftp/ftp_auth_cache_unittest.cc; sourceTree = SOURCE_ROOT; }; + 2C481A2E21097E841607B968 /* client_socket.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = client_socket.cc; sourceTree = "<group>"; }; 4D4C5C050EF1B8C5002CA805 /* filter_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = filter_unittest.cc; sourceTree = "<group>"; }; 533102E60E5E3EBF00FF8E32 /* net_util_posix.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = net_util_posix.cc; sourceTree = "<group>"; }; 58586B4C2F020D851B930BF2 /* cert_verify_result.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cert_verify_result.h; sourceTree = "<group>"; }; @@ -689,9 +694,12 @@ 93D11DCD0E91463000C36437 /* file_stream_posix.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_stream_posix.cc; sourceTree = "<group>"; }; A5AB7BFB0EB7DBA10070A7D3 /* file_stream_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_stream_unittest.cc; sourceTree = "<group>"; }; ACAB6D5C0F43A727D039E138 /* ftp_auth_cache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ftp_auth_cache.h; path = ftp/ftp_auth_cache.h; sourceTree = SOURCE_ROOT; }; + AD46F9C0118A7D723526A361 /* http_response_info.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = http_response_info.cc; sourceTree = "<group>"; }; B87DD6154A7A9ED60F28F016 /* cert_verifier.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cert_verifier.cc; sourceTree = "<group>"; }; C081BA94B2F59669BFAFD808 /* cert_status_flags.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cert_status_flags.cc; sourceTree = "<group>"; }; D4726BC70CCE10F4FF2A5E12 /* connection_type_histograms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = connection_type_histograms.h; sourceTree = "<group>"; }; + D67E592A64772BE82718FD4C /* io_buffer.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = io_buffer.cc; sourceTree = "<group>"; }; + D7745B2B51F48114C05EB14A /* addr.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = addr.cc; sourceTree = "<group>"; }; DD0B3349460AB0703FCE0C7A /* cert_verifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cert_verifier.h; sourceTree = "<group>"; }; DFC96EF80EF9BC5D003C335B /* eviction.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = eviction.cc; sourceTree = "<group>"; }; DFC96EF90EF9BC5D003C335B /* eviction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = eviction.h; sourceTree = "<group>"; }; @@ -904,6 +912,7 @@ B87DD6154A7A9ED60F28F016 /* cert_verifier.cc */, DD0B3349460AB0703FCE0C7A /* cert_verifier.h */, 58586B4C2F020D851B930BF2 /* cert_verify_result.h */, + 2C481A2E21097E841607B968 /* client_socket.cc */, 7BED32710E5A181C00A747DB /* client_socket.h */, 7BED32700E5A181C00A747DB /* client_socket_factory.cc */, 7BED326F0E5A181C00A747DB /* client_socket_factory.h */, @@ -950,6 +959,7 @@ 7BED32B40E5A181C00A747DB /* host_resolver.h */, 7B82FF450E763620008F45CF /* host_resolver_unittest.cc */, 7BA3615D0E8C35A50023C8B9 /* host_resolver_unittest.h */, + D67E592A64772BE82718FD4C /* io_buffer.cc */, 7BED32B30E5A181C00A747DB /* listen_socket.cc */, 7BED32B20E5A181C00A747DB /* listen_socket.h */, 7BED32B10E5A181C00A747DB /* listen_socket_unittest.cc */, @@ -1017,6 +1027,7 @@ 7BED32D30E5A18E800A747DB /* disk_cache */ = { isa = PBXGroup; children = ( + D7745B2B51F48114C05EB14A /* addr.cc */, 7BED32F50E5A190600A747DB /* addr.h */, 7BED32EE0E5A190600A747DB /* addr_unittest.cc */, 7BED32EB0E5A190600A747DB /* backend_impl.cc */, @@ -1107,6 +1118,7 @@ 7BED33440E5A194700A747DB /* http_response_headers.cc */, 7BED334D0E5A194700A747DB /* http_response_headers.h */, 7BED33480E5A194700A747DB /* http_response_headers_unittest.cc */, + AD46F9C0118A7D723526A361 /* http_response_info.cc */, 7BED33450E5A194700A747DB /* http_response_info.h */, 7BED33650E5A194700A747DB /* http_transaction.h */, 7BED33530E5A194700A747DB /* http_transaction_factory.h */, @@ -1471,6 +1483,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 81C766A4F7089E3ED5BD33A4 /* addr.cc in Sources */, 7B8503E90E5B2D4700730B43 /* address_list.cc in Sources */, 7B8503EA0E5B2D4F00730B43 /* backend_impl.cc in Sources */, 7BA015440E5A1BFA00044150 /* base64.cc in Sources */, @@ -1479,6 +1492,7 @@ 7B8504050E5B2DBD00730B43 /* cache_util_posix.cc in Sources */, 7BCF4CF2ECABD68C18FA59F7 /* cert_status_flags.cc in Sources */, B07E3550EFE4B6C6680D49BE /* cert_verifier.cc in Sources */, + 3853286C2A6C0BE6E1113FA2 /* client_socket.cc in Sources */, E4CE9C0D0E8BFFFA00D5378C /* client_socket_factory.cc in Sources */, 7B8504080E5B2DD800730B43 /* client_socket_handle.cc in Sources */, 7B8504090E5B2DD800730B43 /* client_socket_pool.cc in Sources */, @@ -1511,8 +1525,10 @@ E49DD3290E893336003C7A87 /* http_network_layer.cc in Sources */, E4CE9BC50E8BF92400D5378C /* http_network_transaction.cc in Sources */, 821F21300E5CD746003C7E38 /* http_response_headers.cc in Sources */, + E51639B07E0FC884891C5135 /* http_response_info.cc in Sources */, 7B85042F0E5B2E4900730B43 /* http_util.cc in Sources */, 821F207F0E5CD3C6003C7E38 /* http_vary_data.cc in Sources */, + A2420E59B0E92F1C5DF8FE67 /* io_buffer.cc in Sources */, A50055FF0EBF8018007B0A90 /* listen_socket.cc in Sources */, 7B8504320E5B2E4900730B43 /* mapped_file_posix.cc in Sources */, 7B8504330E5B2E4900730B43 /* mem_backend_impl.cc in Sources */, diff --git a/net/net_lib.scons b/net/net_lib.scons index 5f2f3f0..dfc5c71 100644 --- a/net/net_lib.scons +++ b/net/net_lib.scons @@ -31,6 +31,7 @@ input_files = ChromeFileList([ 'base/cert_verifier.cc', 'base/cert_verifier.h', 'base/cert_verify_result.h', + 'base/client_socket.cc', 'base/client_socket.h', 'base/client_socket_factory.cc', 'base/client_socket_factory.h', @@ -66,6 +67,7 @@ input_files = ChromeFileList([ 'base/gzip_header.h', 'base/host_resolver.cc', 'base/host_resolver.h', + 'base/io_buffer.cc', 'base/io_buffer.h', 'base/listen_socket.cc', 'base/listen_socket.h', @@ -180,6 +182,7 @@ input_files = ChromeFileList([ 'http/http_request_info.h', 'http/http_response_headers.cc', 'http/http_response_headers.h', + 'http/http_response_info.cc', 'http/http_response_info.h', 'http/http_transaction.h', 'http/http_transaction_factory.h', @@ -189,6 +192,7 @@ input_files = ChromeFileList([ 'http/http_vary_data.h', ]), MSVSFilter('disk_cache', [ + 'disk_cache/addr.cc', 'disk_cache/addr.h', 'disk_cache/backend_impl.cc', 'disk_cache/backend_impl.h', diff --git a/net/url_request/mime_sniffer_proxy.cc b/net/url_request/mime_sniffer_proxy.cc index 3a8d9a9..6a6b6e9 100644 --- a/net/url_request/mime_sniffer_proxy.cc +++ b/net/url_request/mime_sniffer_proxy.cc @@ -4,6 +4,7 @@ #include "net/url_request/mime_sniffer_proxy.h" +#include "net/base/io_buffer.h" #include "net/base/mime_sniffer.h" static const int kBufferSize = 1024; diff --git a/net/url_request/mime_sniffer_proxy.h b/net/url_request/mime_sniffer_proxy.h index 898ea60..7d2eba8 100644 --- a/net/url_request/mime_sniffer_proxy.h +++ b/net/url_request/mime_sniffer_proxy.h @@ -22,9 +22,12 @@ #ifndef NET_URL_REQUEST_MIME_SNIFFER_PROXY_H_ #define NET_URL_REQUEST_MIME_SNIFFER_PROXY_H_ -#include "net/base/io_buffer.h" #include "net/url_request/url_request.h" +namespace net { +class IOBuffer; +} + class MimeSnifferProxy : public URLRequest::Delegate { public: // The constructor inserts this MimeSnifferProxy in between the URLRequest diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc index 0a510d8..fefd24c 100644 --- a/net/url_request/url_request.cc +++ b/net/url_request/url_request.cc @@ -4,17 +4,17 @@ #include "net/url_request/url_request.h" -#include "base/basictypes.h" #include "base/message_loop.h" #include "base/process_util.h" #include "base/singleton.h" #include "base/stats_counters.h" #include "base/string_util.h" -#include "googleurl/src/gurl.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" #include "net/base/upload_data.h" +#include "net/http/http_response_headers.h" #include "net/http/http_util.h" +#include "net/url_request/url_request_context.h" #include "net/url_request/url_request_job.h" #include "net/url_request/url_request_job_manager.h" @@ -101,6 +101,19 @@ void URLRequest::AppendFileRangeToUpload(const wstring& file_path, upload_->AppendFileRange(file_path, offset, length); } +void URLRequest::set_upload(net::UploadData* upload) { + upload_ = upload; +} + +// Get the upload data directly. +net::UploadData* URLRequest::get_upload() { + return upload_.get(); +} + +bool URLRequest::has_upload() const { + return upload_ != NULL; +} + void URLRequest::SetExtraRequestHeaderById(int id, const string& value, bool overwrite) { DCHECK(!is_pending_); @@ -171,6 +184,10 @@ void URLRequest::GetAllResponseHeaders(string* headers) { } } +net::HttpResponseHeaders* URLRequest::response_headers() const { + return response_info_.headers.get(); +} + bool URLRequest::GetResponseCookies(ResponseCookies* cookies) { DCHECK(job_); return job_->GetResponseCookies(cookies); @@ -206,6 +223,21 @@ bool URLRequest::IsHandledURL(const GURL& url) { return IsHandledProtocol(url.scheme()); } +void URLRequest::set_policy_url(const GURL& policy_url) { + DCHECK(!is_pending_); + policy_url_ = policy_url; +} + +void URLRequest::set_method(const std::string& method) { + DCHECK(!is_pending_); + method_ = method; +} + +void URLRequest::set_referrer(const std::string& referrer) { + DCHECK(!is_pending_); + referrer_ = referrer; +} + void URLRequest::Start() { DCHECK(!is_pending_); DCHECK(!job_); @@ -377,6 +409,14 @@ int URLRequest::Redirect(const GURL& location, int http_status_code) { return net::OK; } +URLRequestContext* URLRequest::context() { + return context_.get(); +} + +void URLRequest::set_context(URLRequestContext* context) { + context_ = context; +} + int64 URLRequest::GetExpectedContentSize() const { int64 expected_content_size = -1; if (job_) @@ -384,3 +424,12 @@ int64 URLRequest::GetExpectedContentSize() const { return expected_content_size; } + +#ifndef NDEBUG + +URLRequestMetrics::~URLRequestMetrics() { + DLOG_IF(WARNING, object_count != 0) << + "Leaking " << object_count << " URLRequest object(s)"; +} + +#endif diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h index 008d304..f4aee3a 100644 --- a/net/url_request/url_request.h +++ b/net/url_request/url_request.h @@ -8,22 +8,22 @@ #include <string> #include <vector> -#include "base/basictypes.h" -#include "base/logging.h" #include "base/ref_counted.h" #include "base/time.h" #include "googleurl/src/gurl.h" #include "net/base/load_states.h" -#include "net/base/ssl_info.h" -#include "net/base/upload_data.h" -#include "net/base/x509_certificate.h" #include "net/http/http_response_info.h" -#include "net/url_request/url_request_context.h" #include "net/url_request/url_request_status.h" namespace net { + class IOBuffer; +class UploadData; +class X509Certificate; + } + +class URLRequestContext; class URLRequestJob; // This stores the values of the Set-Cookie headers received during the request. @@ -203,29 +203,20 @@ class URLRequest { // The URL that should be consulted for the third-party cookie blocking // policy. const GURL& policy_url() const { return policy_url_; } - void set_policy_url(const GURL& policy_url) { - DCHECK(!is_pending_); - policy_url_ = policy_url; - } + void set_policy_url(const GURL& policy_url); // The request method, as an uppercase string. "GET" is the default value. // The request method may only be changed before Start() is called and // should only be assigned an uppercase value. const std::string& method() const { return method_; } - void set_method(const std::string& method) { - DCHECK(!is_pending_); - method_ = method; - } + void set_method(const std::string& method); // The referrer URL for the request. This header may actually be suppressed // from the underlying network request for security reasons (e.g., a HTTPS // URL will not be sent as the referrer for a HTTP request). The referrer // may only be changed before Start() is called. const std::string& referrer() const { return referrer_; } - void set_referrer(const std::string& referrer) { - DCHECK(!is_pending_); - referrer_ = referrer; - } + void set_referrer(const std::string& referrer); // The delegate of the request. This value may be changed at any time, // and it is permissible for it to be null. @@ -250,13 +241,13 @@ class URLRequest { } // Set the upload data directly. - void set_upload(net::UploadData* upload) { upload_ = upload; } + void set_upload(net::UploadData* upload); // Get the upload data directly. - net::UploadData* get_upload() { return upload_.get(); } + net::UploadData* get_upload(); // Returns true if the request has a non-empty message body to upload. - bool has_upload() const { return upload_ != NULL; } + bool has_upload() const; // Set an extra request header by ID or name. These methods may only be // called before Start() is called. It is an error to call it later. @@ -309,9 +300,7 @@ class URLRequest { // Get all response headers, as a HttpResponseHeaders object. See comments // in HttpResponseHeaders class as to the format of the data. - net::HttpResponseHeaders* response_headers() const { - return response_info_.headers.get(); - } + net::HttpResponseHeaders* response_headers() const; // Get the SSL connection info. const net::SSLInfo& ssl_info() const { @@ -421,8 +410,8 @@ class URLRequest { void set_enable_profiling(bool profiling) { enable_profiling_ = profiling; } // Used to specify the context (cookie store, cache) for this request. - URLRequestContext* context() { return context_.get(); } - void set_context(URLRequestContext* context) { context_ = context; } + URLRequestContext* context(); + void set_context(URLRequestContext* context); // Returns the expected content size if available int64 GetExpectedContentSize() const; @@ -497,7 +486,7 @@ class URLRequest { // first transaction in a request involving redirects. uint64 final_upload_progress_; - DISALLOW_EVIL_CONSTRUCTORS(URLRequest); + DISALLOW_COPY_AND_ASSIGN(URLRequest); }; //----------------------------------------------------------------------------- @@ -510,10 +499,7 @@ class URLRequest { struct URLRequestMetrics { int object_count; URLRequestMetrics() : object_count(0) {} - ~URLRequestMetrics() { - DLOG_IF(WARNING, object_count != 0) << - "Leaking " << object_count << " URLRequest object(s)"; - } + ~URLRequestMetrics(); }; extern URLRequestMetrics url_request_metrics; @@ -526,8 +512,6 @@ extern URLRequestMetrics url_request_metrics; #define URLREQUEST_COUNT_CTOR() #define URLREQUEST_COUNT_DTOR() -#endif - +#endif // #ifndef NDEBUG #endif // NET_URL_REQUEST_URL_REQUEST_H_ - diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h index f439482..ba2a11c 100644 --- a/net/url_request/url_request_context.h +++ b/net/url_request/url_request_context.h @@ -15,9 +15,9 @@ #include "base/string_util.h" #include "net/base/cookie_policy.h" #include "net/ftp/ftp_auth_cache.h" -#include "net/http/http_transaction_factory.h" namespace net { +class HttpTransactionFactory; class CookieMonster; class ProxyService; } diff --git a/net/url_request/url_request_error_job.cc b/net/url_request/url_request_error_job.cc index b065b3c..032d495 100644 --- a/net/url_request/url_request_error_job.cc +++ b/net/url_request/url_request_error_job.cc @@ -6,6 +6,7 @@ #include "base/message_loop.h" #include "net/base/net_errors.h" +#include "net/url_request/url_request_status.h" URLRequestErrorJob::URLRequestErrorJob(URLRequest* request, int error) : URLRequestJob(request), error_(error) { diff --git a/net/url_request/url_request_file_job.h b/net/url_request/url_request_file_job.h index 0ccaa5a..3aff74b 100644 --- a/net/url_request/url_request_file_job.h +++ b/net/url_request/url_request_file_job.h @@ -20,7 +20,7 @@ class URLRequestFileJob : public URLRequestJob { virtual void Start(); virtual void Kill(); - virtual bool ReadRawData(net::IOBuffer* buf, int buf_size, int *bytes_read); + virtual bool ReadRawData(net::IOBuffer* buf, int buf_size, int* bytes_read); virtual bool IsRedirectResponse(GURL* location, int* http_status_code); virtual bool GetMimeType(std::string* mime_type); diff --git a/net/url_request/url_request_filter.cc b/net/url_request/url_request_filter.cc index b3040da..f52855e 100644 --- a/net/url_request/url_request_filter.cc +++ b/net/url_request/url_request_filter.cc @@ -6,6 +6,8 @@ #include <set> +#include "base/logging.h" + URLRequestFilter* URLRequestFilter::shared_instance_ = NULL; /* static */ diff --git a/net/url_request/url_request_ftp_job.cc b/net/url_request/url_request_ftp_job.cc index 465217d..cf41f11 100644 --- a/net/url_request/url_request_ftp_job.cc +++ b/net/url_request/url_request_ftp_job.cc @@ -15,6 +15,7 @@ #include "net/base/net_util.h" #include "net/base/wininet_util.h" #include "net/url_request/url_request.h" +#include "net/url_request/url_request_context.h" #include "net/url_request/url_request_error_job.h" #include "net/base/escape.h" diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc index e7e8b20..0f65534 100644 --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc @@ -17,10 +17,12 @@ #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "net/base/sdch_manager.h" +#include "net/http/http_response_headers.h" #include "net/http/http_response_info.h" #include "net/http/http_transaction.h" #include "net/http/http_transaction_factory.h" #include "net/url_request/url_request.h" +#include "net/url_request/url_request_context.h" #include "net/url_request/url_request_error_job.h" // TODO(darin): make sure the port blocking code is not lost diff --git a/net/url_request/url_request_http_job.h b/net/url_request/url_request_http_job.h index a77d462..53d46f4 100644 --- a/net/url_request/url_request_http_job.h +++ b/net/url_request/url_request_http_job.h @@ -5,10 +5,10 @@ #ifndef NET_URL_REQUEST_URL_REQUEST_HTTP_JOB_H_ #define NET_URL_REQUEST_URL_REQUEST_HTTP_JOB_H_ -#include <string> #include <vector> #include "base/scoped_ptr.h" +#include "net/base/auth.h" #include "net/base/completion_callback.h" #include "net/http/http_request_info.h" #include "net/url_request/url_request_job.h" diff --git a/net/url_request/url_request_inet_job.cc b/net/url_request/url_request_inet_job.cc index ccf1a77..f5fb9db 100644 --- a/net/url_request/url_request_inet_job.cc +++ b/net/url_request/url_request_inet_job.cc @@ -13,6 +13,7 @@ #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "net/base/wininet_util.h" +#include "net/url_request/url_request_context.h" #include "net/url_request/url_request_error_job.h" #include "net/url_request/url_request_ftp_job.h" #include "net/url_request/url_request_job_metrics.h" diff --git a/net/url_request/url_request_job.h b/net/url_request/url_request_job.h index 0a5744b..d9729fe 100644 --- a/net/url_request/url_request_job.h +++ b/net/url_request/url_request_job.h @@ -8,14 +8,12 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/ref_counted.h" -#include "net/base/auth.h" #include "net/base/filter.h" #include "net/base/load_states.h" -#include "net/url_request/url_request_status.h" namespace net { +class AuthChallengeInfo; class HttpResponseInfo; class IOBuffer; class UploadData; @@ -23,6 +21,7 @@ class UploadData; class GURL; class URLRequest; +class URLRequestStatus; class URLRequestJobMetrics; // The URLRequestJob is using RefCounterThreadSafe because some sub classes @@ -201,13 +200,13 @@ class URLRequestJob : public base::RefCountedThreadSafe<URLRequestJob> { void NotifyReadComplete(int bytes_read); // Notifies the request that a start error has occurred. - void NotifyStartError(const URLRequestStatus &status); + void NotifyStartError(const URLRequestStatus& status); // NotifyDone marks when we are done with a request. It is really // a glorified set_status, but also does internal state checking and // job tracking. It should be called once per request, when the job is // finished doing all IO. - void NotifyDone(const URLRequestStatus &status); + void NotifyDone(const URLRequestStatus& status); // Some work performed by NotifyDone must be completed on a separate task // so as to avoid re-entering the delegate. This method exists to perform @@ -251,7 +250,7 @@ class URLRequestJob : public base::RefCountedThreadSafe<URLRequestJob> { const URLRequestStatus GetStatus(); // Set the status of the job. - void SetStatus(const URLRequestStatus &status); + void SetStatus(const URLRequestStatus& status); // Whether the job is doing performance profiling bool is_profiling_; @@ -304,4 +303,3 @@ class URLRequestJob : public base::RefCountedThreadSafe<URLRequestJob> { }; #endif // NET_URL_REQUEST_URL_REQUEST_JOB_H_ - diff --git a/net/url_request/url_request_simple_job.cc b/net/url_request/url_request_simple_job.cc index a4ef4e1..8f684ab 100644 --- a/net/url_request/url_request_simple_job.cc +++ b/net/url_request/url_request_simple_job.cc @@ -6,6 +6,7 @@ #include "base/message_loop.h" #include "net/base/net_errors.h" +#include "net/url_request/url_request_status.h" URLRequestSimpleJob::URLRequestSimpleJob(URLRequest* request) : URLRequestJob(request), diff --git a/net/url_request/url_request_simple_job.h b/net/url_request/url_request_simple_job.h index 183598a..87dbcb1 100644 --- a/net/url_request/url_request_simple_job.h +++ b/net/url_request/url_request_simple_job.h @@ -2,12 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_URL_REQUEST_URL_REQUEST_SIMPLE_JOB_H__ -#define NET_URL_REQUEST_URL_REQUEST_SIMPLE_JOB_H__ +#ifndef NET_URL_REQUEST_URL_REQUEST_SIMPLE_JOB_H_ +#define NET_URL_REQUEST_URL_REQUEST_SIMPLE_JOB_H_ -#include "net/url_request/url_request.h" #include "net/url_request/url_request_job.h" +class URLRequest; + class URLRequestSimpleJob : public URLRequestJob { public: URLRequestSimpleJob(URLRequest* request); @@ -32,5 +33,4 @@ class URLRequestSimpleJob : public URLRequestJob { int data_offset_; }; -#endif // NET_URL_REQUEST_URL_REQUEST_DATA_JOB_H__ - +#endif // NET_URL_REQUEST_URL_REQUEST_DATA_JOB_H_ diff --git a/net/url_request/url_request_test_job.cc b/net/url_request/url_request_test_job.cc index baefc3d..fce29fd 100644 --- a/net/url_request/url_request_test_job.cc +++ b/net/url_request/url_request_test_job.cc @@ -9,6 +9,7 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "net/base/net_errors.h" +#include "net/http/http_response_headers.h" #include "net/url_request/url_request.h" // This emulates the global message loop for the test URL request class, since diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index 21d1c72..5ba7165 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -29,6 +29,7 @@ #include "net/disk_cache/disk_cache.h" #include "net/http/http_cache.h" #include "net/http/http_network_layer.h" +#include "net/http/http_response_headers.h" #include "net/proxy/proxy_service.h" #include "net/url_request/url_request.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/url_request/url_request_unittest.h b/net/url_request/url_request_unittest.h index 7107d50..0351382 100644 --- a/net/url_request/url_request_unittest.h +++ b/net/url_request/url_request_unittest.h @@ -25,6 +25,7 @@ #include "net/base/net_errors.h" #include "net/http/http_network_layer.h" #include "net/url_request/url_request.h" +#include "net/url_request/url_request_context.h" #include "net/proxy/proxy_service.h" #include "testing/gtest/include/gtest/gtest.h" #include "googleurl/src/url_util.h" diff --git a/net/url_request/url_request_view_cache_job.cc b/net/url_request/url_request_view_cache_job.cc index 0cd4efd..0c6aba2 100644 --- a/net/url_request/url_request_view_cache_job.cc +++ b/net/url_request/url_request_view_cache_job.cc @@ -8,7 +8,8 @@ #include "net/base/escape.h" #include "net/disk_cache/disk_cache.h" #include "net/http/http_cache.h" -#include "net/http/http_response_info.h" +#include "net/http/http_response_headers.h" +#include "net/url_request/url_request_context.h" #define VIEW_CACHE_HEAD \ "<html><body><table>" diff --git a/net/url_request/url_request_view_cache_job.h b/net/url_request/url_request_view_cache_job.h index 5cf6c36..e85d273 100644 --- a/net/url_request/url_request_view_cache_job.h +++ b/net/url_request/url_request_view_cache_job.h @@ -2,9 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_URL_REQUEST_URL_REQUEST_VIEW_CACHE_JOB_H__ -#define NET_URL_REQUEST_URL_REQUEST_VIEW_CACHE_JOB_H__ +#ifndef NET_URL_REQUEST_URL_REQUEST_VIEW_CACHE_JOB_H_ +#define NET_URL_REQUEST_URL_REQUEST_VIEW_CACHE_JOB_H_ +#include "net/url_request/url_request.h" #include "net/url_request/url_request_simple_job.h" namespace disk_cache { @@ -28,5 +29,4 @@ class URLRequestViewCacheJob : public URLRequestSimpleJob { disk_cache::Backend* GetDiskCache() const; }; -#endif // NET_URL_REQUEST_URL_REQUEST_VIEW_CACHE_JOB_H__ - +#endif // NET_URL_REQUEST_URL_REQUEST_VIEW_CACHE_JOB_H_ diff --git a/webkit/glue/SConscript b/webkit/glue/SConscript index 50f1c6f..ba4c351 100644 --- a/webkit/glue/SConscript +++ b/webkit/glue/SConscript @@ -65,6 +65,7 @@ input_files = [ 'plugins/plugin_string_stream.cc', 'resource_fetcher.cc', 'resource_handle_impl.cc', + 'resource_loader_bridge.cc', 'searchable_form_data.cc', 'stacking_order_iterator.cc', 'webcursor.cc', @@ -76,10 +77,12 @@ input_files = [ 'webhistoryitem_impl.cc', 'webkit_glue.cc', 'webmediaplayer_impl.cc', + 'webplugin_delegate.cc', 'webplugin_impl.cc', 'webtextinput_impl.cc', 'weburlrequest_impl.cc', 'webwidget_impl.cc', + 'webview_delegate.cc', 'webview_impl.cc', ] diff --git a/webkit/glue/alt_error_page_resource_fetcher.cc b/webkit/glue/alt_error_page_resource_fetcher.cc index 7d04c4e..722c6c9 100644 --- a/webkit/glue/alt_error_page_resource_fetcher.cc +++ b/webkit/glue/alt_error_page_resource_fetcher.cc @@ -14,7 +14,9 @@ MSVC_POP_WARNING(); #include "webkit/glue/alt_error_page_resource_fetcher.h" #include "webkit/glue/glue_util.h" +#include "webkit/glue/webdatasource.h" #include "webkit/glue/webframe_impl.h" +#include "webkit/glue/weburlrequest.h" #include "webkit/glue/webview_delegate.h" #include "webkit/glue/webview.h" @@ -36,6 +38,9 @@ AltErrorPageResourceFetcher::AltErrorPageResourceFetcher( kDownloadTimeoutSec, this)); } +AltErrorPageResourceFetcher::~AltErrorPageResourceFetcher() { +} + void AltErrorPageResourceFetcher::OnURLFetchComplete( const WebCore::ResourceResponse& response, const std::string& data) { diff --git a/webkit/glue/alt_error_page_resource_fetcher.h b/webkit/glue/alt_error_page_resource_fetcher.h index 171aad6..8181a99 100644 --- a/webkit/glue/alt_error_page_resource_fetcher.h +++ b/webkit/glue/alt_error_page_resource_fetcher.h @@ -13,13 +13,13 @@ MSVC_PUSH_WARNING_LEVEL(0); #include "Timer.h" MSVC_POP_WARNING(); -#include "base/basictypes.h" #include "base/scoped_ptr.h" #include "webkit/glue/resource_fetcher.h" #include "webkit/glue/weberror_impl.h" -#include "webkit/glue/weburlrequest.h" +class ResourceFetcherWithTimeout; class WebFrameImpl; +class WebRequest; class WebView; // Used for downloading alternate dns error pages. Once downloading is done @@ -30,6 +30,7 @@ class AltErrorPageResourceFetcher : public ResourceFetcher::Delegate { const WebErrorImpl& web_error, WebFrameImpl* web_frame, const GURL& url); + ~AltErrorPageResourceFetcher(); virtual void OnURLFetchComplete(const WebCore::ResourceResponse& response, const std::string& data); @@ -44,7 +45,7 @@ class AltErrorPageResourceFetcher : public ResourceFetcher::Delegate { // Does the actual fetching. scoped_ptr<ResourceFetcherWithTimeout> fetcher_; - DISALLOW_EVIL_CONSTRUCTORS(AltErrorPageResourceFetcher); + DISALLOW_COPY_AND_ASSIGN(AltErrorPageResourceFetcher); }; #endif // WEBKIT_GLUE_ALT_ERROR_PAGE_RESOURCE_FETCHER_H__ diff --git a/webkit/glue/chrome_client_impl.cc b/webkit/glue/chrome_client_impl.cc index f23cf43..8d3f161 100644 --- a/webkit/glue/chrome_client_impl.cc +++ b/webkit/glue/chrome_client_impl.cc @@ -31,6 +31,7 @@ MSVC_POP_WARNING(); #include "webkit/glue/webframe_impl.h" #include "webkit/glue/webinputevent.h" #include "webkit/glue/webkit_glue.h" +#include "webkit/glue/weburlrequest_impl.h" #include "webkit/glue/webview_delegate.h" #include "webkit/glue/webview_impl.h" #include "webkit/glue/webwidget_impl.h" diff --git a/webkit/glue/context_menu_client_impl.cc b/webkit/glue/context_menu_client_impl.cc index 584cbe0..79ee0a4 100644 --- a/webkit/glue/context_menu_client_impl.cc +++ b/webkit/glue/context_menu_client_impl.cc @@ -26,6 +26,8 @@ MSVC_POP_WARNING(); #include "webkit/glue/context_menu.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/webdocumentloader_impl.h" +#include "webkit/glue/webresponse.h" +#include "webkit/glue/weburlrequest_impl.h" #include "webkit/glue/webview_impl.h" #include "base/word_iterator.h" diff --git a/webkit/glue/dom_serializer_unittest.cc b/webkit/glue/dom_serializer_unittest.cc index 93cf20d..317a374 100644 --- a/webkit/glue/dom_serializer_unittest.cc +++ b/webkit/glue/dom_serializer_unittest.cc @@ -31,6 +31,7 @@ MSVC_POP_WARNING(); #include "webkit/glue/dom_operations.h" #include "webkit/glue/dom_serializer.h" #include "webkit/glue/dom_serializer_delegate.h" +#include "webkit/glue/glue_util.h" #include "webkit/glue/webframe.h" #include "webkit/glue/webframe_impl.h" #include "webkit/glue/webview.h" diff --git a/webkit/glue/feed_preview.cc b/webkit/glue/feed_preview.cc index 5d6962b..f14753a 100644 --- a/webkit/glue/feed_preview.cc +++ b/webkit/glue/feed_preview.cc @@ -3,7 +3,6 @@ // found in the LICENSE file. #include "config.h" - #include "base/compiler_specific.h" #include "webkit/glue/feed_preview.h" @@ -17,6 +16,7 @@ MSVC_POP_WARNING(); #undef LOG #include "base/logging.h" +#include "googleurl/src/gurl.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/webkit_glue.h" diff --git a/webkit/glue/glue.vcproj b/webkit/glue/glue.vcproj index acaad6f..f31623c 100644 --- a/webkit/glue/glue.vcproj +++ b/webkit/glue/glue.vcproj @@ -1,767 +1,779 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8.00" - Name="Glue" - ProjectGUID="{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}" - RootNamespace="glue" - Keyword="Win32Proj" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - ConfigurationType="4" - InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;.\glue.vsprops" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - ConfigurationType="4" - InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;.\glue.vsprops" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="API" - > - <File - RelativePath=".\autofill_form.cc" - > - </File> - <File - RelativePath=".\autofill_form.h" - > - </File> - <File - RelativePath=".\cache_manager.h" - > - </File> - <File - RelativePath=".\console_message_level.h" - > - </File> - <File - RelativePath=".\context_menu.h" - > - </File> - <File - RelativePath=".\cpp_bound_class.h" - > - </File> - <File - RelativePath=".\cpp_variant.h" - > - </File> - <File - RelativePath=".\form_data.h" - > - </File> - <File - RelativePath=".\image_decoder.h" - > - </File> - <File - RelativePath=".\password_form.h" - > - </File> - <File - RelativePath=".\resource_type.h" - > - </File> - <File - RelativePath=".\screen_info.h" - > - </File> - <File - RelativePath=".\webdatasource.h" - > - </File> - <File - RelativePath=".\weberror.h" - > - </File> - <File - RelativePath=".\webframe.h" - > - </File> - <File - RelativePath=".\webhistoryitem.h" - > - </File> - <File - RelativePath=".\webinputevent.h" - > - </File> - <File - RelativePath=".\webmediaplayer.h" - > - </File> - <File - RelativePath=".\webmediaplayer_delegate.h" - > - </File> - <File - RelativePath=".\webplugin.h" - > - </File> - <File - RelativePath=".\webplugin_delegate.h" - > - </File> - <File - RelativePath=".\webpreferences.h" - > - </File> - <File - RelativePath=".\webresponse.h" - > - </File> - <File - RelativePath=".\webtextinput.h" - > - </File> - <File - RelativePath=".\weburlrequest.h" - > - </File> - <File - RelativePath=".\webview.h" - > - </File> - <File - RelativePath=".\webview_delegate.h" - > - </File> - <File - RelativePath=".\webwidget.h" - > - </File> - <File - RelativePath=".\webwidget_delegate.h" - > - </File> - <File - RelativePath=".\window_open_disposition.h" - > - </File> - </Filter> - <Filter - Name="Library" - > - <File - RelativePath="..\pending\AccessibleBase.cpp" - > - </File> - <File - RelativePath="..\pending\AccessibleBase.h" - > - </File> - <File - RelativePath="..\pending\AccessibleDocument.cpp" - > - </File> - <File - RelativePath="..\pending\AccessibleDocument.h" - > - </File> - <File - RelativePath=".\alt_404_page_resource_fetcher.cc" - > - </File> - <File - RelativePath=".\alt_404_page_resource_fetcher.h" - > - </File> - <File - RelativePath=".\alt_error_page_resource_fetcher.cc" - > - </File> - <File - RelativePath=".\alt_error_page_resource_fetcher.h" - > - </File> - <File - RelativePath=".\back_forward_list_client_impl.cc" - > - </File> - <File - RelativePath=".\back_forward_list_client_impl.h" - > - </File> - <File - RelativePath=".\cache_manager.cc" - > - </File> - <File - RelativePath=".\chrome_client_impl.cc" - > - </File> - <File - RelativePath=".\chrome_client_impl.h" - > - </File> - <File - RelativePath=".\chromium_bridge_impl.cc" - > - </File> - <File - RelativePath=".\chromium_threading.cc" - > - </File> - <File - RelativePath=".\clipboard_conversion.cc" - > - </File> - <File - RelativePath=".\clipboard_conversion.h" - > - </File> - <File - RelativePath=".\context_menu_client_impl.cc" - > - </File> - <File - RelativePath=".\context_menu_client_impl.h" - > - </File> - <File - RelativePath=".\cpp_binding_example.cc" - > - </File> - <File - RelativePath=".\cpp_bound_class.cc" - > - </File> - <File - RelativePath=".\cpp_variant.cc" - > - </File> - <File - RelativePath=".\debugger_bridge.cc" - > - </File> - <File - RelativePath=".\debugger_bridge.h" - > - </File> - <File - RelativePath=".\dom_operations.cc" - > - </File> - <File - RelativePath=".\dom_operations.h" - > - </File> - <File - RelativePath=".\dom_serializer.cc" - > - </File> - <File - RelativePath=".\dom_serializer.h" - > - </File> - <File - RelativePath=".\dom_serializer_delegate.h" - > - </File> - <File - RelativePath=".\dragclient_impl.cc" - > - </File> - <File - RelativePath=".\dragclient_impl.h" - > - </File> - <File - RelativePath=".\editor_client_impl.cc" - > - </File> - <File - RelativePath=".\editor_client_impl.h" - > - </File> - <File - RelativePath=".\entity_map.cc" - > - </File> - <File - RelativePath=".\entity_map.h" - > - </File> - <File - RelativePath=".\event_conversion.cc" - > - </File> - <File - RelativePath=".\event_conversion.h" - > - </File> - <File - RelativePath=".\feed_preview.cc" - > - </File> - <File - RelativePath=".\feed_preview.h" - > - </File> - <File - RelativePath=".\glue_accessibility.cc" - > - </File> - <File - RelativePath=".\glue_accessibility.h" - > - </File> - <File - RelativePath=".\glue_serialize.cc" - > - </File> - <File - RelativePath=".\glue_serialize.h" - > - </File> - <File - RelativePath=".\glue_util.cc" - > - </File> - <File - RelativePath=".\glue_util.h" - > - </File> - <File - RelativePath=".\image_decoder.cc" - > - </File> - <File - RelativePath=".\image_resource_fetcher.cc" - > - </File> - <File - RelativePath=".\image_resource_fetcher.h" - > - </File> - <File - RelativePath=".\inspector_client_impl.cc" - > - </File> - <File - RelativePath=".\inspector_client_impl.h" - > - </File> - <File - RelativePath=".\localized_strings.cc" - > - </File> - <File - RelativePath=".\media_player_private_impl.cc" - > - </File> - <File - RelativePath=".\multipart_response_delegate.cc" - > - </File> - <File - RelativePath=".\multipart_response_delegate.h" - > - </File> - <File - RelativePath=".\npruntime_util.cc" - > - </File> - <File - RelativePath=".\npruntime_util.h" - > - </File> - <File - RelativePath=".\password_autocomplete_listener.cc" - > - </File> - <File - RelativePath=".\password_autocomplete_listener.h" - > - </File> - <File - RelativePath=".\password_form_dom_manager.cc" - > - </File> - <File - RelativePath=".\password_form_dom_manager.h" - > - </File> - <File - RelativePath=".\resource.h" - > - </File> - <File - RelativePath=".\resource_fetcher.cc" - > - </File> - <File - RelativePath=".\resource_fetcher.h" - > - </File> - <File - RelativePath=".\resource_handle_impl.cc" - > - </File> - <File - RelativePath=".\resource_loader_bridge.h" - > - </File> - <File - RelativePath=".\scoped_clipboard_writer_glue.h" - > - </File> - <File - RelativePath=".\searchable_form_data.cc" - > - </File> - <File - RelativePath=".\searchable_form_data.h" - > - </File> - <File - RelativePath=".\stacking_order_iterator.cc" - > - </File> - <File - RelativePath=".\stacking_order_iterator.h" - > - </File> - <File - RelativePath=".\webcursor.cc" - > - </File> - <File - RelativePath=".\webcursor.h" - > - </File> - <File - RelativePath=".\webcursor_win.cc" - > - </File> - <File - RelativePath=".\webdatasource_impl.cc" - > - </File> - <File - RelativePath=".\webdatasource_impl.h" - > - </File> - <File - RelativePath=".\webdocumentloader_impl.cc" - > - </File> - <File - RelativePath=".\webdocumentloader_impl.h" - > - </File> - <File - RelativePath=".\webdropdata.cc" - > - </File> - <File - RelativePath=".\webdropdata.h" - > - </File> - <File - RelativePath=".\weberror_impl.cc" - > - </File> - <File - RelativePath=".\weberror_impl.h" - > - </File> - <File - RelativePath=".\webframe_impl.cc" - > - </File> - <File - RelativePath=".\webframe_impl.h" - > - </File> - <File - RelativePath=".\webframeloaderclient_impl.cc" - > - </File> - <File - RelativePath=".\webframeloaderclient_impl.h" - > - </File> - <File - RelativePath=".\webhistoryitem_impl.cc" - > - </File> - <File - RelativePath=".\webhistoryitem_impl.h" - > - </File> - <File - RelativePath=".\webinputevent_win.cc" - > - </File> - <File - RelativePath=".\webkit_glue.cc" - > - </File> - <File - RelativePath=".\webkit_glue.h" - > - </File> - <File - RelativePath=".\webkit_glue_win.cc" - > - </File> - <File - RelativePath=".\webmediaplayer_impl.cc" - > - </File> - <File - RelativePath=".\webmediaplayer_impl.h" - > - </File> - <File - RelativePath=".\webplugin_impl.cc" - > - </File> - <File - RelativePath=".\webplugin_impl.h" - > - </File> - <File - RelativePath=".\webresponse_impl.h" - > - </File> - <File - RelativePath=".\webtextinput_impl.cc" - > - </File> - <File - RelativePath=".\webtextinput_impl.h" - > - </File> - <File - RelativePath=".\weburlrequest_impl.cc" - > - </File> - <File - RelativePath=".\weburlrequest_impl.h" - > - </File> - <File - RelativePath=".\webview_impl.cc" - > - </File> - <File - RelativePath=".\webview_impl.h" - > - </File> - <File - RelativePath=".\webwidget_impl.cc" - > - </File> - <File - RelativePath=".\webwidget_impl.h" - > - </File> - </Filter> - <Filter - Name="Plugins" - > - <File - RelativePath=".\plugins\mozilla_extensions.cc" - > - </File> - <File - RelativePath=".\plugins\mozilla_extensions.h" - > - </File> - <File - RelativePath=".\plugins\nphostapi.h" - > - </File> - <File - RelativePath=".\plugins\plugin_constants_win.h" - > - </File> - <File - RelativePath=".\plugins\plugin_host.cc" - > - </File> - <File - RelativePath=".\plugins\plugin_host.h" - > - </File> - <File - RelativePath=".\plugins\plugin_instance.cc" - > - </File> - <File - RelativePath=".\plugins\plugin_instance.h" - > - </File> - <File - RelativePath=".\plugins\plugin_lib.cc" - > - </File> - <File - RelativePath=".\plugins\plugin_lib.h" - > - </File> - <File - RelativePath=".\plugins\plugin_lib_win.cc" - > - </File> - <File - RelativePath=".\plugins\plugin_list.cc" - > - </File> - <File - RelativePath=".\plugins\plugin_list.h" - > - </File> - <File - RelativePath=".\plugins\plugin_list_win.cc" - > - </File> - <File - RelativePath=".\plugins\plugin_stream.cc" - > - </File> - <File - RelativePath=".\plugins\plugin_stream.h" - > - </File> - <File - RelativePath=".\plugins\plugin_stream_url.cc" - > - </File> - <File - RelativePath=".\plugins\plugin_stream_url.h" - > - </File> - <File - RelativePath=".\plugins\plugin_stream_win.cc" - > - </File> - <File - RelativePath=".\plugins\plugin_string_stream.cc" - > - </File> - <File - RelativePath=".\plugins\plugin_string_stream.h" - > - </File> - <File - RelativePath=".\plugins\webplugin_delegate_impl.cc" - > - </File> - <File - RelativePath=".\plugins\webplugin_delegate_impl.h" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> +<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="Glue"
+ ProjectGUID="{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}"
+ RootNamespace="glue"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;.\glue.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;.\glue.vsprops"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="API"
+ >
+ <File
+ RelativePath=".\autofill_form.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\autofill_form.h"
+ >
+ </File>
+ <File
+ RelativePath=".\cache_manager.h"
+ >
+ </File>
+ <File
+ RelativePath=".\console_message_level.h"
+ >
+ </File>
+ <File
+ RelativePath=".\context_menu.h"
+ >
+ </File>
+ <File
+ RelativePath=".\cpp_bound_class.h"
+ >
+ </File>
+ <File
+ RelativePath=".\cpp_variant.h"
+ >
+ </File>
+ <File
+ RelativePath=".\form_data.h"
+ >
+ </File>
+ <File
+ RelativePath=".\image_decoder.h"
+ >
+ </File>
+ <File
+ RelativePath=".\password_form.h"
+ >
+ </File>
+ <File
+ RelativePath=".\resource_type.h"
+ >
+ </File>
+ <File
+ RelativePath=".\screen_info.h"
+ >
+ </File>
+ <File
+ RelativePath=".\webdatasource.h"
+ >
+ </File>
+ <File
+ RelativePath=".\weberror.h"
+ >
+ </File>
+ <File
+ RelativePath=".\webframe.h"
+ >
+ </File>
+ <File
+ RelativePath=".\webhistoryitem.h"
+ >
+ </File>
+ <File
+ RelativePath=".\webinputevent.h"
+ >
+ </File>
+ <File
+ RelativePath=".\webmediaplayer.h"
+ >
+ </File>
+ <File
+ RelativePath=".\webmediaplayer_delegate.h"
+ >
+ </File>
+ <File
+ RelativePath=".\webplugin.h"
+ >
+ </File>
+ <File
+ RelativePath=".\webplugin_delegate.h"
+ >
+ </File>
+ <File
+ RelativePath=".\webpreferences.h"
+ >
+ </File>
+ <File
+ RelativePath=".\webresponse.h"
+ >
+ </File>
+ <File
+ RelativePath=".\webtextinput.h"
+ >
+ </File>
+ <File
+ RelativePath=".\weburlrequest.h"
+ >
+ </File>
+ <File
+ RelativePath=".\webview.h"
+ >
+ </File>
+ <File
+ RelativePath=".\webview_delegate.h"
+ >
+ </File>
+ <File
+ RelativePath=".\webwidget.h"
+ >
+ </File>
+ <File
+ RelativePath=".\webwidget_delegate.h"
+ >
+ </File>
+ <File
+ RelativePath=".\window_open_disposition.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Library"
+ >
+ <File
+ RelativePath="..\pending\AccessibleBase.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\pending\AccessibleBase.h"
+ >
+ </File>
+ <File
+ RelativePath="..\pending\AccessibleDocument.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\pending\AccessibleDocument.h"
+ >
+ </File>
+ <File
+ RelativePath=".\alt_404_page_resource_fetcher.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\alt_404_page_resource_fetcher.h"
+ >
+ </File>
+ <File
+ RelativePath=".\alt_error_page_resource_fetcher.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\alt_error_page_resource_fetcher.h"
+ >
+ </File>
+ <File
+ RelativePath=".\back_forward_list_client_impl.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\back_forward_list_client_impl.h"
+ >
+ </File>
+ <File
+ RelativePath=".\cache_manager.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\chrome_client_impl.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\chrome_client_impl.h"
+ >
+ </File>
+ <File
+ RelativePath=".\chromium_bridge_impl.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\chromium_threading.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\clipboard_conversion.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\clipboard_conversion.h"
+ >
+ </File>
+ <File
+ RelativePath=".\context_menu_client_impl.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\context_menu_client_impl.h"
+ >
+ </File>
+ <File
+ RelativePath=".\cpp_binding_example.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\cpp_bound_class.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\cpp_variant.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\debugger_bridge.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\debugger_bridge.h"
+ >
+ </File>
+ <File
+ RelativePath=".\dom_operations.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\dom_operations.h"
+ >
+ </File>
+ <File
+ RelativePath=".\dom_serializer.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\dom_serializer.h"
+ >
+ </File>
+ <File
+ RelativePath=".\dom_serializer_delegate.h"
+ >
+ </File>
+ <File
+ RelativePath=".\dragclient_impl.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\dragclient_impl.h"
+ >
+ </File>
+ <File
+ RelativePath=".\editor_client_impl.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\editor_client_impl.h"
+ >
+ </File>
+ <File
+ RelativePath=".\entity_map.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\entity_map.h"
+ >
+ </File>
+ <File
+ RelativePath=".\event_conversion.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\event_conversion.h"
+ >
+ </File>
+ <File
+ RelativePath=".\feed_preview.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\feed_preview.h"
+ >
+ </File>
+ <File
+ RelativePath=".\glue_accessibility.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\glue_accessibility.h"
+ >
+ </File>
+ <File
+ RelativePath=".\glue_serialize.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\glue_serialize.h"
+ >
+ </File>
+ <File
+ RelativePath=".\glue_util.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\glue_util.h"
+ >
+ </File>
+ <File
+ RelativePath=".\image_decoder.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\image_resource_fetcher.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\image_resource_fetcher.h"
+ >
+ </File>
+ <File
+ RelativePath=".\inspector_client_impl.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\inspector_client_impl.h"
+ >
+ </File>
+ <File
+ RelativePath=".\localized_strings.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\media_player_private_impl.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\multipart_response_delegate.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\multipart_response_delegate.h"
+ >
+ </File>
+ <File
+ RelativePath=".\npruntime_util.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\npruntime_util.h"
+ >
+ </File>
+ <File
+ RelativePath=".\password_autocomplete_listener.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\password_autocomplete_listener.h"
+ >
+ </File>
+ <File
+ RelativePath=".\password_form_dom_manager.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\password_form_dom_manager.h"
+ >
+ </File>
+ <File
+ RelativePath=".\resource.h"
+ >
+ </File>
+ <File
+ RelativePath=".\resource_fetcher.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\resource_fetcher.h"
+ >
+ </File>
+ <File
+ RelativePath=".\resource_handle_impl.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\resource_loader_bridge.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\resource_loader_bridge.h"
+ >
+ </File>
+ <File
+ RelativePath=".\scoped_clipboard_writer_glue.h"
+ >
+ </File>
+ <File
+ RelativePath=".\searchable_form_data.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\searchable_form_data.h"
+ >
+ </File>
+ <File
+ RelativePath=".\stacking_order_iterator.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\stacking_order_iterator.h"
+ >
+ </File>
+ <File
+ RelativePath=".\webcursor.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\webcursor.h"
+ >
+ </File>
+ <File
+ RelativePath=".\webcursor_win.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\webdatasource_impl.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\webdatasource_impl.h"
+ >
+ </File>
+ <File
+ RelativePath=".\webdocumentloader_impl.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\webdocumentloader_impl.h"
+ >
+ </File>
+ <File
+ RelativePath=".\webdropdata.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\webdropdata.h"
+ >
+ </File>
+ <File
+ RelativePath=".\weberror_impl.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\weberror_impl.h"
+ >
+ </File>
+ <File
+ RelativePath=".\webframe_impl.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\webframe_impl.h"
+ >
+ </File>
+ <File
+ RelativePath=".\webframeloaderclient_impl.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\webframeloaderclient_impl.h"
+ >
+ </File>
+ <File
+ RelativePath=".\webhistoryitem_impl.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\webhistoryitem_impl.h"
+ >
+ </File>
+ <File
+ RelativePath=".\webinputevent_win.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\webkit_glue.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\webkit_glue.h"
+ >
+ </File>
+ <File
+ RelativePath=".\webkit_glue_win.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\webmediaplayer_impl.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\webmediaplayer_impl.h"
+ >
+ </File>
+ <File
+ RelativePath=".\webplugin_delegate.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\webplugin_impl.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\webplugin_impl.h"
+ >
+ </File>
+ <File
+ RelativePath=".\webresponse_impl.h"
+ >
+ </File>
+ <File
+ RelativePath=".\webtextinput_impl.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\webtextinput_impl.h"
+ >
+ </File>
+ <File
+ RelativePath=".\weburlrequest_impl.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\weburlrequest_impl.h"
+ >
+ </File>
+ <File
+ RelativePath=".\webview_delegate.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\webview_impl.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\webview_impl.h"
+ >
+ </File>
+ <File
+ RelativePath=".\webwidget_impl.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\webwidget_impl.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Plugins"
+ >
+ <File
+ RelativePath=".\plugins\mozilla_extensions.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\plugins\mozilla_extensions.h"
+ >
+ </File>
+ <File
+ RelativePath=".\plugins\nphostapi.h"
+ >
+ </File>
+ <File
+ RelativePath=".\plugins\plugin_constants_win.h"
+ >
+ </File>
+ <File
+ RelativePath=".\plugins\plugin_host.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\plugins\plugin_host.h"
+ >
+ </File>
+ <File
+ RelativePath=".\plugins\plugin_instance.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\plugins\plugin_instance.h"
+ >
+ </File>
+ <File
+ RelativePath=".\plugins\plugin_lib.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\plugins\plugin_lib.h"
+ >
+ </File>
+ <File
+ RelativePath=".\plugins\plugin_lib_win.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\plugins\plugin_list.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\plugins\plugin_list.h"
+ >
+ </File>
+ <File
+ RelativePath=".\plugins\plugin_list_win.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\plugins\plugin_stream.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\plugins\plugin_stream.h"
+ >
+ </File>
+ <File
+ RelativePath=".\plugins\plugin_stream_url.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\plugins\plugin_stream_url.h"
+ >
+ </File>
+ <File
+ RelativePath=".\plugins\plugin_stream_win.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\plugins\plugin_string_stream.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\plugins\plugin_string_stream.h"
+ >
+ </File>
+ <File
+ RelativePath=".\plugins\webplugin_delegate_impl.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\plugins\webplugin_delegate_impl.h"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/webkit/glue/glue_util.cc b/webkit/glue/glue_util.cc index a81da6b..113d413 100644 --- a/webkit/glue/glue_util.cc +++ b/webkit/glue/glue_util.cc @@ -3,23 +3,28 @@ // found in the LICENSE file. #include "config.h" -#include <string> +#include "base/compiler_specific.h" #include "webkit/glue/glue_util.h" -#include "base/compiler_specific.h" -#include "base/gfx/rect.h" -#include "base/string_piece.h" -#include "base/string_util.h" -#include "base/sys_string_conversions.h" + +#include <string> MSVC_PUSH_WARNING_LEVEL(0); -#undef LOG #include "CString.h" #include "IntRect.h" #include "PlatformString.h" +#include "KURL.h" MSVC_POP_WARNING(); -#include "KURL.h" +#undef LOG + +#include "base/compiler_specific.h" +#include "base/gfx/rect.h" +#include "base/string_piece.h" +#include "base/string_util.h" +#include "base/sys_string_conversions.h" +#include "googleurl/src/gurl.h" + namespace webkit_glue { diff --git a/webkit/glue/glue_util.h b/webkit/glue/glue_util.h index 0bb7106..576ec34 100644 --- a/webkit/glue/glue_util.h +++ b/webkit/glue/glue_util.h @@ -5,11 +5,10 @@ #ifndef WEBKIT_GLUE_GLUE_UTIL_H_ #define WEBKIT_GLUE_GLUE_UTIL_H_ -#include <string> - #include "base/file_path.h" #include "base/string16.h" -#include "googleurl/src/gurl.h" + +class GURL; namespace WebCore { class CString; @@ -57,4 +56,3 @@ WebCore::IntRect ToIntRect(const gfx::Rect& r); } // namespace webkit_glue #endif // #ifndef WEBKIT_GLUE_GLUE_UTIL_H_ - diff --git a/webkit/glue/inspector_client_impl.cc b/webkit/glue/inspector_client_impl.cc index e997a73..cc28821 100644 --- a/webkit/glue/inspector_client_impl.cc +++ b/webkit/glue/inspector_client_impl.cc @@ -17,6 +17,7 @@ MSVC_POP_WARNING(); #undef LOG #include "webkit/glue/inspector_client_impl.h" #include "webkit/glue/webkit_glue.h" +#include "webkit/glue/weburlrequest.h" #include "webkit/glue/webview_impl.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" diff --git a/webkit/glue/password_form_dom_manager.h b/webkit/glue/password_form_dom_manager.h index fcca8c7..6beb0ab 100644 --- a/webkit/glue/password_form_dom_manager.h +++ b/webkit/glue/password_form_dom_manager.h @@ -8,9 +8,6 @@ #include "webkit/glue/form_data.h" #include "webkit/glue/password_form.h" -#include <map> -#include <vector> - namespace WebCore { class HTMLFormElement; class HTMLInputElement; diff --git a/webkit/glue/plugins/webplugin_delegate_impl.h b/webkit/glue/plugins/webplugin_delegate_impl.h index 46d0f95..0474d26 100644 --- a/webkit/glue/plugins/webplugin_delegate_impl.h +++ b/webkit/glue/plugins/webplugin_delegate_impl.h @@ -12,6 +12,7 @@ #include "base/file_path.h" #include "base/gfx/native_widget_types.h" +#include "base/gfx/rect.h" #include "base/ref_counted.h" #include "base/task.h" #include "third_party/npapi/bindings/npapi.h" diff --git a/webkit/glue/resource_handle_impl.cc b/webkit/glue/resource_handle_impl.cc index 66f321d..ee7acb4 100644 --- a/webkit/glue/resource_handle_impl.cc +++ b/webkit/glue/resource_handle_impl.cc @@ -57,6 +57,7 @@ MSVC_POP_WARNING(); #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "net/base/load_flags.h" +#include "net/http/http_response_headers.h" using webkit_glue::ResourceLoaderBridge; using base::Time; diff --git a/webkit/glue/resource_loader_bridge.cc b/webkit/glue/resource_loader_bridge.cc new file mode 100644 index 0000000..5b29fb0 --- /dev/null +++ b/webkit/glue/resource_loader_bridge.cc @@ -0,0 +1,32 @@ +// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. +// + +#include "config.h" + +#include "webkit/glue/resource_loader_bridge.h" + +#include "net/http/http_response_headers.h" + +namespace webkit_glue { + +ResourceLoaderBridge::ResponseInfo::ResponseInfo() { +} + +ResourceLoaderBridge::ResponseInfo::~ResponseInfo() { +} + +ResourceLoaderBridge::SyncLoadResponse::SyncLoadResponse() { +} + +ResourceLoaderBridge::SyncLoadResponse::~SyncLoadResponse() { +} + +ResourceLoaderBridge::ResourceLoaderBridge() { +} + +ResourceLoaderBridge::~ResourceLoaderBridge() { +} + +} // namespace webkit_glue diff --git a/webkit/glue/resource_loader_bridge.h b/webkit/glue/resource_loader_bridge.h index ce09b21..2698cb4 100644 --- a/webkit/glue/resource_loader_bridge.h +++ b/webkit/glue/resource_loader_bridge.h @@ -14,26 +14,29 @@ // In turn, the bridge's owner on the WebKit end will implement the Peer // interface, which we will use to communicate notifications back. -#ifndef RESOURCE_LOADER_BRIDGE_H__ -#define RESOURCE_LOADER_BRIDGE_H__ +#ifndef RESOURCE_LOADER_BRIDGE_H_ +#define RESOURCE_LOADER_BRIDGE_H_ -#include <string> - -#include "base/basictypes.h" #include "base/ref_counted.h" #include "base/time.h" #include "googleurl/src/gurl.h" -#include "net/http/http_response_headers.h" #include "net/url_request/url_request_status.h" #include "webkit/glue/resource_type.h" class WebFrame; +namespace net { +class HttpResponseHeaders; +} + namespace webkit_glue { class ResourceLoaderBridge { public: struct ResponseInfo { + ResponseInfo(); + ~ResponseInfo(); + // The time at which the request was made that resulted in this response. // For cached responses, this time could be "far" in the past. base::Time request_time; @@ -60,7 +63,24 @@ class ResourceLoaderBridge { int64 content_length; }; - // generated by the bridge. This is implemented by our custom resource loader + // See the SyncLoad method declared below. (The name of this struct is not + // suffixed with "Info" because it also contains the response data.) + struct SyncLoadResponse : ResponseInfo { + SyncLoadResponse(); + ~SyncLoadResponse(); + + // The response status. + URLRequestStatus status; + + // The final URL of the response. This may differ from the request URL in + // the case of a server redirect. + GURL url; + + // The response data. + std::string data; + }; + + // Generated by the bridge. This is implemented by our custom resource loader // within webkit. The Peer and it's bridge should have identical lifetimes // as they represent each end of a communication channel. // @@ -100,7 +120,7 @@ class ResourceLoaderBridge { // use Create() for construction, but anybody can delete at any time, // INCLUDING during processing of callbacks. - virtual ~ResourceLoaderBridge() {} + virtual ~ResourceLoaderBridge(); // Call this method to make a new instance. The method name is a HTTP-style // method name (e.g., "GET" or "POST"). The URL should be an absolute URL @@ -169,20 +189,6 @@ class ResourceLoaderBridge { // method may only be called after a successful call to the Start method. virtual void SetDefersLoading(bool value) = 0; - // See the SyncLoad method declared below. (The name of this struct is not - // suffixed with "Info" because it also contains the response data.) - struct SyncLoadResponse : ResponseInfo { - // The response status. - URLRequestStatus status; - - // The final URL of the response. This may differ from the request URL in - // the case of a server redirect. - GURL url; - - // The response data. - std::string data; - }; - // Call this method to load the resource synchronously (i.e., in one shot). // This is an alternative to the Start method. Be warned that this method // will block the calling thread until the resource is fully downloaded or an @@ -194,7 +200,7 @@ class ResourceLoaderBridge { protected: // construction must go through Create() - ResourceLoaderBridge() {} + ResourceLoaderBridge(); private: DISALLOW_EVIL_CONSTRUCTORS(ResourceLoaderBridge); @@ -202,5 +208,4 @@ class ResourceLoaderBridge { } // namespace webkit_glue -#endif // RESOURCE_LOADER_BRIDGE__ - +#endif // RESOURCE_LOADER_BRIDGE_ diff --git a/webkit/glue/webdatasource.h b/webkit/glue/webdatasource.h index 02d9a48..3f3eb0d 100644 --- a/webkit/glue/webdatasource.h +++ b/webkit/glue/webdatasource.h @@ -8,8 +8,8 @@ #include <vector> #include "base/basictypes.h" -#include "googleurl/src/gurl.h" +class GURL; struct PasswordForm; class SearchableFormData; class WebFrame; diff --git a/webkit/glue/webdatasource_impl.h b/webkit/glue/webdatasource_impl.h index e4394bb..d5daa22 100644 --- a/webkit/glue/webdatasource_impl.h +++ b/webkit/glue/webdatasource_impl.h @@ -23,13 +23,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef WEBKIT_GLUE_WEBDATASOURCE_IMPL_H__ -#define WEBKIT_GLUE_WEBDATASOURCE_IMPL_H__ +#ifndef WEBKIT_GLUE_WEBDATASOURCE_IMPL_H_ +#define WEBKIT_GLUE_WEBDATASOURCE_IMPL_H_ #include "webkit/glue/webdatasource.h" #include "webkit/glue/webresponse_impl.h" #include "webkit/glue/weburlrequest_impl.h" -#include "base/basictypes.h" struct PasswordForm; class SearchableFormData; @@ -91,7 +90,7 @@ private: // who modifies this when to keep it up to date. std::vector<GURL> redirect_chain_; - DISALLOW_EVIL_CONSTRUCTORS(WebDataSourceImpl); + DISALLOW_COPY_AND_ASSIGN(WebDataSourceImpl); }; -#endif // #ifndef WEBKIT_GLUE_WEBDATASOURCE_IMPL_H__ +#endif // #ifndef WEBKIT_GLUE_WEBDATASOURCE_IMPL_H_ diff --git a/webkit/glue/webframe.h b/webkit/glue/webframe.h index a500bdc..75b2fb9 100644 --- a/webkit/glue/webframe.h +++ b/webkit/glue/webframe.h @@ -5,12 +5,8 @@ #ifndef WEBKIT_GLUE_WEBFRAME_H_ #define WEBKIT_GLUE_WEBFRAME_H_ -#include <string> - -#include "base/basictypes.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "base/gfx/size.h" #include "skia/ext/bitmap_platform_device.h" #include "skia/ext/platform_canvas.h" #include "webkit/glue/console_message_level.h" @@ -30,8 +26,6 @@ class Rect; class Size; } -// TODO(darin): use GURL everywhere a URL string appears - // Every frame in a web page is represented by one WebFrame, including the // outermost frame. class WebFrame { diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc index a6d3c96..fcfd641 100644 --- a/webkit/glue/webframe_impl.cc +++ b/webkit/glue/webframe_impl.cc @@ -134,10 +134,13 @@ MSVC_POP_WARNING(); #include "webkit/glue/alt_error_page_resource_fetcher.h" #include "webkit/glue/dom_operations.h" #include "webkit/glue/glue_serialize.h" +#include "webkit/glue/glue_util.h" #include "webkit/glue/webdocumentloader_impl.h" +#include "webkit/glue/webdatasource_impl.h" #include "webkit/glue/weberror_impl.h" #include "webkit/glue/webframe_impl.h" #include "webkit/glue/webhistoryitem_impl.h" +#include "webkit/glue/weburlrequest_impl.h" #include "webkit/glue/webtextinput_impl.h" #include "webkit/glue/webview_impl.h" @@ -590,6 +593,11 @@ void WebFrameImpl::CacheCurrentRequestInfo(WebDataSourceImpl* datasource) { datasource->SetExtraData(extra); } +void WebFrameImpl::set_currently_loading_history_item( + WebHistoryItemImpl* item) { + currently_loading_history_item_ = item; +} + void WebFrameImpl::StopLoading() { if (!frame_) return; diff --git a/webkit/glue/webframe_impl.h b/webkit/glue/webframe_impl.h index 3633651..546b8c9b 100644 --- a/webkit/glue/webframe_impl.h +++ b/webkit/glue/webframe_impl.h @@ -26,20 +26,12 @@ #ifndef WEBKIT_GLUE_WEBFRAME_IMPL_H_ #define WEBKIT_GLUE_WEBFRAME_IMPL_H_ -#include <string> - -#include "base/basictypes.h" -#include "base/compiler_specific.h" #include "base/scoped_ptr.h" #include "base/task.h" #include "skia/ext/platform_canvas.h" #include "webkit/glue/password_autocomplete_listener.h" -#include "webkit/glue/webdatasource_impl.h" #include "webkit/glue/webframe.h" #include "webkit/glue/webframeloaderclient_impl.h" -#include "webkit/glue/webhistoryitem_impl.h" -#include "webkit/glue/webplugin_delegate.h" -#include "webkit/glue/webview_delegate.h" MSVC_PUSH_WARNING_LEVEL(0); #include "ResourceHandleClient.h" @@ -48,7 +40,10 @@ MSVC_PUSH_WARNING_LEVEL(0); MSVC_POP_WARNING(); class AltErrorPageResourceFetcher; +class WebDataSourceImpl; class WebErrorImpl; +class WebHistoryItemImpl; +class WebPluginDelegate; class WebRequest; class WebView; class WebViewImpl; @@ -220,9 +215,7 @@ class WebFrameImpl : public WebFrame, public base::RefCounted<WebFrameImpl> { // If currently_loading_request is NULL, does nothing. void CacheCurrentRequestInfo(WebDataSourceImpl* datasource); - void set_currently_loading_history_item(WebHistoryItemImpl* item) { - currently_loading_history_item_ = item; - } + void set_currently_loading_history_item(WebHistoryItemImpl* item); // Getters for the impls corresponding to Get(Provisional)DataSource. They // may return NULL if there is no corresponding data source. diff --git a/webkit/glue/webhistoryitem.h b/webkit/glue/webhistoryitem.h index 65c12eb..6757211 100644 --- a/webkit/glue/webhistoryitem.h +++ b/webkit/glue/webhistoryitem.h @@ -2,13 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GLUE_WEBHISTORYITEM_H__ -#define WEBKIT_GLUE_WEBHISTORYITEM_H__ +#ifndef WEBKIT_GLUE_WEBHISTORYITEM_H_ +#define WEBKIT_GLUE_WEBHISTORYITEM_H_ -#include <string> - -#include "base/basictypes.h" -#include "base/ref_counted.h" #include "webkit/glue/weburlrequest.h" // for WebRequest::ExtraData class GURL; @@ -40,5 +36,4 @@ class WebHistoryItem : public base::RefCounted<WebHistoryItem> { DISALLOW_EVIL_CONSTRUCTORS(WebHistoryItem); }; -#endif // #ifndef WEBKIT_GLUE_WEBHISTORYITEM_H__ - +#endif // #ifndef WEBKIT_GLUE_WEBHISTORYITEM_H_ diff --git a/webkit/glue/webhistoryitem_impl.h b/webkit/glue/webhistoryitem_impl.h index 983c858..b28fb91 100644 --- a/webkit/glue/webhistoryitem_impl.h +++ b/webkit/glue/webhistoryitem_impl.h @@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GLUE_WEBHISTORYITEM_IMPL_H__ -#define WEBKIT_GLUE_WEBHISTORYITEM_IMPL_H__ +#ifndef WEBKIT_GLUE_WEBHISTORYITEM_IMPL_H_ +#define WEBKIT_GLUE_WEBHISTORYITEM_IMPL_H_ -#include "base/basictypes.h" #include "webkit/glue/webhistoryitem.h" #include "googleurl/src/gurl.h" @@ -42,8 +41,7 @@ class WebHistoryItemImpl : public WebHistoryItem { scoped_refptr<WebRequest::ExtraData> extra_data_; private: - DISALLOW_EVIL_CONSTRUCTORS(WebHistoryItemImpl); + DISALLOW_COPY_AND_ASSIGN(WebHistoryItemImpl); }; -#endif // #ifndef WEBKIT_GLUE_WEBHISTORYITEM_IMPL_H__ - +#endif // #ifndef WEBKIT_GLUE_WEBHISTORYITEM_IMPL_H_ diff --git a/webkit/glue/webplugin_delegate.cc b/webkit/glue/webplugin_delegate.cc new file mode 100644 index 0000000..ea1f285 --- /dev/null +++ b/webkit/glue/webplugin_delegate.cc @@ -0,0 +1,36 @@ +// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "config.h" + +#undef LOG + +#include "webkit/glue/webplugin_delegate.h" + +#include "base/logging.h" +#include "base/gfx/rect.h" + +bool WebPluginDelegate::IsWindowless() const { + NOTREACHED(); + return false; +} + +const gfx::Rect& WebPluginDelegate::GetRect() const { + NOTREACHED(); + static gfx::Rect dummy; + return dummy; +} + +const gfx::Rect& WebPluginDelegate::GetClipRect() const { + NOTREACHED(); + return GetRect(); +} + +#if defined(OS_WIN) +// Returns a combinaison of PluginQuirks. +int WebPluginDelegate::GetQuirks() const { + NOTREACHED(); + return 0; +} +#endif diff --git a/webkit/glue/webplugin_delegate.h b/webkit/glue/webplugin_delegate.h index 254d94f..a7bf9e1 100644 --- a/webkit/glue/webplugin_delegate.h +++ b/webkit/glue/webplugin_delegate.h @@ -5,25 +5,25 @@ #ifndef WEBKIT_GLUE_WEBPLUGIN_DELEGATE_H_ #define WEBKIT_GLUE_WEBPLUGIN_DELEGATE_H_ -#include <string> #include <vector> -#include "base/basictypes.h" -#include "base/file_path.h" #include "base/gfx/native_widget_types.h" -#include "base/gfx/rect.h" -#include "build/build_config.h" #include "third_party/npapi/bindings/npapi.h" // TODO(port): put in OS_WIN check. typedef struct HDC__* HDC; struct NPObject; +class FilePath; class GURL; class WebCursor; class WebPlugin; class WebPluginResourceClient; +namespace gfx { +class Rect; +} + // This is the interface that a plugin implementation needs to provide. class WebPluginDelegate { public: @@ -139,32 +139,19 @@ class WebPluginDelegate { virtual void URLRequestRouted(const std::string&url, bool notify_needed, void* notify_data) = 0; - virtual bool IsWindowless() const { - NOTREACHED(); - return false; - } + virtual bool IsWindowless() const; - virtual const gfx::Rect& GetRect() const { - NOTREACHED(); - static gfx::Rect dummy; - return dummy; - } + virtual const gfx::Rect& GetRect() const; - virtual const gfx::Rect& GetClipRect() const { - NOTREACHED(); - return GetRect(); - } + virtual const gfx::Rect& GetClipRect() const; #if defined(OS_WIN) // Returns a combinaison of PluginQuirks. - virtual int GetQuirks() const { - NOTREACHED(); - return 0; - } + virtual int GetQuirks() const; #endif private: - DISALLOW_EVIL_CONSTRUCTORS(WebPluginDelegate); + DISALLOW_COPY_AND_ASSIGN(WebPluginDelegate); }; #endif // #ifndef WEBKIT_GLUE_WEBPLUGIN_DELEGATE_H_ diff --git a/webkit/glue/webresponse.h b/webkit/glue/webresponse.h index 7259057..34abd935 100644 --- a/webkit/glue/webresponse.h +++ b/webkit/glue/webresponse.h @@ -2,11 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GLUE_WEBURLRESPONSE_H__ -#define WEBKIT_GLUE_WEBURLRESPONSE_H__ +#ifndef WEBKIT_GLUE_WEBURLRESPONSE_H_ +#define WEBKIT_GLUE_WEBURLRESPONSE_H_ #include <string> +#include "base/basictypes.h" + class GURL; class WebResponse { @@ -33,5 +35,4 @@ private: DISALLOW_EVIL_CONSTRUCTORS(WebResponse); }; -#endif // #ifndef WEBKIT_GLUE_WEBURLRESPONSE_H__ - +#endif // #ifndef WEBKIT_GLUE_WEBURLRESPONSE_H_ diff --git a/webkit/glue/webresponse_impl.h b/webkit/glue/webresponse_impl.h index 504094b..e9dfddf 100644 --- a/webkit/glue/webresponse_impl.h +++ b/webkit/glue/webresponse_impl.h @@ -2,12 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GLUE_WEBRESPONSEIMPL_H__ -#define WEBKIT_GLUE_WEBRESPONSEIMPL_H__ +#ifndef WEBKIT_GLUE_WEBRESPONSEIMPL_H_ +#define WEBKIT_GLUE_WEBRESPONSEIMPL_H_ -#include <string> - -#include "googleurl/src/gurl.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/webresponse.h" @@ -48,5 +45,4 @@ class WebResponseImpl : public WebResponse { DISALLOW_EVIL_CONSTRUCTORS(WebResponseImpl); }; -#endif // #ifndef WEBKIT_GLUE_WEBRESPONSEIMPL_H__ - +#endif // #ifndef WEBKIT_GLUE_WEBRESPONSEIMPL_H_ diff --git a/webkit/glue/weburlrequest.h b/webkit/glue/weburlrequest.h index d62ccbf..537b87d 100644 --- a/webkit/glue/weburlrequest.h +++ b/webkit/glue/weburlrequest.h @@ -2,13 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GLUE_WEBURLREQUEST_H__ -#define WEBKIT_GLUE_WEBURLREQUEST_H__ +#ifndef WEBKIT_GLUE_WEBURLREQUEST_H_ +#define WEBKIT_GLUE_WEBURLREQUEST_H_ #include <map> #include <string> -#include "base/basictypes.h" #include "base/ref_counted.h" enum WebRequestCachePolicy { @@ -127,5 +126,4 @@ class WebRequest { virtual ~WebRequest() { } }; -#endif // #ifndef WEBKIT_GLUE_WEBURLREQUEST_H__ - +#endif // #ifndef WEBKIT_GLUE_WEBURLREQUEST_H_ diff --git a/webkit/glue/weburlrequest_impl.cc b/webkit/glue/weburlrequest_impl.cc index 6734a7e..b4416f9 100644 --- a/webkit/glue/weburlrequest_impl.cc +++ b/webkit/glue/weburlrequest_impl.cc @@ -13,6 +13,7 @@ MSVC_POP_WARNING(); #undef LOG #include "base/logging.h" +#include "googleurl/src/gurl.h" #include "net/base/upload_data.h" #include "webkit/glue/weburlrequest_impl.h" #include "webkit/glue/glue_serialize.h" diff --git a/webkit/glue/weburlrequest_impl.h b/webkit/glue/weburlrequest_impl.h index b3c5bc7..0548c26 100644 --- a/webkit/glue/weburlrequest_impl.h +++ b/webkit/glue/weburlrequest_impl.h @@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GLUE_WEBURLREQUEST_IMPL_H__ -#define WEBKIT_GLUE_WEBURLREQUEST_IMPL_H__ +#ifndef WEBKIT_GLUE_WEBURLREQUEST_IMPL_H_ +#define WEBKIT_GLUE_WEBURLREQUEST_IMPL_H_ -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "webkit/glue/weburlrequest.h" @@ -66,5 +65,4 @@ class WebRequestImpl : public WebRequest { scoped_refptr<ExtraData> extra_data_; }; -#endif // #ifndef WEBKIT_GLUE_WEBURLREQUEST_IMPL_H__ - +#endif // #ifndef WEBKIT_GLUE_WEBURLREQUEST_IMPL_H_ diff --git a/webkit/glue/webview_delegate.cc b/webkit/glue/webview_delegate.cc new file mode 100644 index 0000000..f4afb2b --- /dev/null +++ b/webkit/glue/webview_delegate.cc @@ -0,0 +1,29 @@ +// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "config.h" + +#undef LOG + +#include "webkit/glue/webview_delegate.h" + +#include "base/logging.h" +#include "googleurl/src/gurl.h" + +void WebViewDelegate::SetSmartInsertDeleteEnabled(bool enabled) { + // This method is only used in test shell, which overrides this + // method. + NOTREACHED(); +} + +void WebViewDelegate::SetSelectTrailingWhitespaceEnabled(bool enabled) { + // This method is only used in test shell, which overrides this + // method. + NOTREACHED(); +} + +GURL WebViewDelegate::GetAlternateErrorPageURL(const GURL& failedURL, + ErrorPageType error_type) { + return GURL(); +} diff --git a/webkit/glue/webview_delegate.h b/webkit/glue/webview_delegate.h index 892c25e..359d45c 100644 --- a/webkit/glue/webview_delegate.h +++ b/webkit/glue/webview_delegate.h @@ -26,15 +26,10 @@ #ifndef WEBKIT_GLUE_WEBVIEW_DELEGATE_H_ #define WEBKIT_GLUE_WEBVIEW_DELEGATE_H_ -#include <string> #include <vector> -#include "base/basictypes.h" -#include "base/logging.h" -#include "googleurl/src/gurl.h" #include "webkit/glue/context_menu.h" #include "webkit/glue/webwidget_delegate.h" -#include "webkit/glue/window_open_disposition.h" namespace gfx { class Point; @@ -657,11 +652,7 @@ class WebViewDelegate : virtual public WebWidgetDelegate { return true; } - virtual void SetSmartInsertDeleteEnabled(bool enabled) { - // This method is only used in test shell, which overrides this - // method. - NOTREACHED(); - } + virtual void SetSmartInsertDeleteEnabled(bool enabled); virtual bool IsSelectTrailingWhitespaceEnabled() { #if defined(OS_WIN) @@ -671,11 +662,7 @@ class WebViewDelegate : virtual public WebWidgetDelegate { #endif } - virtual void SetSelectTrailingWhitespaceEnabled(bool enabled) { - // This method is only used in test shell, which overrides this - // method. - NOTREACHED(); - } + virtual void SetSelectTrailingWhitespaceEnabled(bool enabled); virtual void DidBeginEditing() { } virtual void DidChangeSelection(bool is_empty_selection) { } @@ -711,9 +698,7 @@ class WebViewDelegate : virtual public WebWidgetDelegate { // error pages. |error_name| tells the delegate what type of error page we // want (e.g., 404 vs dns errors). virtual GURL GetAlternateErrorPageURL(const GURL& failedURL, - ErrorPageType error_type) { - return GURL(); - } + ErrorPageType error_type); // History Related --------------------------------------------------------- diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc index d7737f3..c81d205 100644 --- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc +++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc @@ -40,6 +40,7 @@ #include "net/base/io_buffer.h" #include "net/base/net_util.h" #include "net/base/upload_data.h" +#include "net/http/http_response_headers.h" #include "net/proxy/proxy_service.h" #include "net/url_request/url_request.h" #include "webkit/glue/resource_loader_bridge.h" diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj index f696e94..8c74440 100644 --- a/webkit/webkit.xcodeproj/project.pbxproj +++ b/webkit/webkit.xcodeproj/project.pbxproj @@ -82,6 +82,7 @@ 53AAC3800F291F4400233688 /* ThreadableLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53AAC37F0F291F4300233688 /* ThreadableLoader.cpp */; }; 53AAC3940F291FCF00233688 /* HTTPHeaderMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 53AAC3930F291FCF00233688 /* HTTPHeaderMap.cpp */; }; 53E8BE100EC36A4E00B3F8B0 /* dom_operations.cc in Sources */ = {isa = PBXBuildFile; fileRef = 825405050D92E3DA0006B936 /* dom_operations.cc */; }; + 58E986F9F1CA5FC0A89313B0 /* webview_delegate.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4A48A12D02638BF9107FD26D /* webview_delegate.cc */; }; 6B873B9C0A9CB97EE5F350BC /* V8DOMWindowCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31C1FF1C3BB820B928CFE9BD /* V8DOMWindowCustom.cpp */; }; 7B1438070E7874FC00901940 /* webframeloaderclient_impl.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8254053F0D92E3DA0006B936 /* webframeloaderclient_impl.cc */; }; 7B5E85E70D7F28F5001ECF42 /* Assertions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E85B60D7F28F5001ECF42 /* Assertions.cpp */; }; @@ -1311,6 +1312,7 @@ AB9552760F37AA2E0015C8FB /* webplugin_impl.cc in Sources */ = {isa = PBXBuildFile; fileRef = AB9552750F37AA2E0015C8FB /* webplugin_impl.cc */; }; AB9552AE0F37AC0B0015C8FB /* stacking_order_iterator.cc in Sources */ = {isa = PBXBuildFile; fileRef = AB9552AD0F37AC0B0015C8FB /* stacking_order_iterator.cc */; }; ABF923090F3A388C009B64EC /* webplugin_delegate_impl_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = 825405ED0D92E3FF0006B936 /* webplugin_delegate_impl_mac.cc */; }; + B26072924B6C110181ECF928 /* webplugin_delegate.cc in Sources */ = {isa = PBXBuildFile; fileRef = 1459AC310DEBF6A597167F45 /* webplugin_delegate.cc */; }; B52EC24C0F2FE04A0051A2C4 /* FormControlElementWithState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B52EC24B0F2FE04A0051A2C4 /* FormControlElementWithState.cpp */; }; B52EC2550F2FE07B0051A2C4 /* CachedFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B52EC2530F2FE07B0051A2C4 /* CachedFrame.cpp */; }; B58DCCE90F27DF0100BF697A /* InputElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B58DCCE80F27DF0100BF697A /* InputElement.cpp */; }; @@ -1359,6 +1361,7 @@ E48A06DE0E3F840F00172919 /* image_resource_fetcher.cc in Sources */ = {isa = PBXBuildFile; fileRef = E48A06D80E3F840F00172919 /* image_resource_fetcher.cc */; }; E4A238C70E3FA19C002BDE14 /* image_decoder.cc in Sources */ = {isa = PBXBuildFile; fileRef = E4A238C50E3FA19C002BDE14 /* image_decoder.cc */; }; E4E4C94A0E797648009A687C /* ImageSourceCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E8FBD0D7F3CC1001ECF42 /* ImageSourceCG.cpp */; }; + E7CC722700DA5F7E55527582 /* resource_loader_bridge.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5D2A55FF5C399F9800256956 /* resource_loader_bridge.cc */; }; FA5597EF54C7B6F57B05E0EF /* DOMTimer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 753B36EAFA2321BA827FFE23 /* DOMTimer.cpp */; }; FBBBF2E4099C8EA9BDAF80F9 /* CurrentTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CCBDDEF91A55ACE86471036E /* CurrentTime.cpp */; }; /* End PBXBuildFile section */ @@ -1509,6 +1512,7 @@ 04C3AFC50EF1E45F0046D578 /* WorkerNavigator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerNavigator.cpp; sourceTree = "<group>"; }; 04C3AFC70EF1E4650046D578 /* WorkerNavigator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerNavigator.h; sourceTree = "<group>"; }; 0F9CD02EE3AE2D8974EDFE58 /* RenderBoxModelObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderBoxModelObject.h; sourceTree = "<group>"; }; + 1459AC310DEBF6A597167F45 /* webplugin_delegate.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = webplugin_delegate.cc; sourceTree = "<group>"; }; 1DF458E80DD265C670E05B03 /* RenderSelectionInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSelectionInfo.h; sourceTree = "<group>"; }; 20EF92D9CD4E55999674A63E /* CurrentTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CurrentTime.h; sourceTree = "<group>"; }; 31493A4FA536C112F8C2FB03 /* PNGImageEncoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PNGImageEncoder.cpp; path = "../third_party/WebKit/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp"; sourceTree = SOURCE_ROOT; }; @@ -1593,6 +1597,7 @@ 41DE7CA40F424BEE0049BC24 /* V8HTMLSelectElementCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = V8HTMLSelectElementCustom.h; sourceTree = "<group>"; }; 41DEA0670F27C0F900E40D43 /* BackForwardListChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BackForwardListChromium.cpp; sourceTree = "<group>"; }; 41F1D4620EF70D1600DA8753 /* FontFastPath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontFastPath.cpp; sourceTree = "<group>"; }; + 4A48A12D02638BF9107FD26D /* webview_delegate.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = webview_delegate.cc; sourceTree = "<group>"; }; 4C04BF9CDE7B0B591087B440 /* RenderObjectChildList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderObjectChildList.h; sourceTree = "<group>"; }; 4CDA86D8A0B62BD0EBF07D78 /* AnimationControllerPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AnimationControllerPrivate.h; path = ../third_party/WebKit/WebCore/page/animation/AnimationControllerPrivate.h; sourceTree = SOURCE_ROOT; }; 4D1637C30EBFA49E008F024E /* SQLiteAuthorizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SQLiteAuthorizer.cpp; sourceTree = "<group>"; }; @@ -1906,6 +1911,7 @@ 53AAC3820F291F6300233688 /* ThreadableLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadableLoaderClient.h; sourceTree = "<group>"; }; 53AAC3930F291FCF00233688 /* HTTPHeaderMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTTPHeaderMap.cpp; sourceTree = "<group>"; }; 53E8BE8D0EC36F4B00B3F8B0 /* autocomplete_input_listener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = autocomplete_input_listener.h; sourceTree = "<group>"; }; + 5D2A55FF5C399F9800256956 /* resource_loader_bridge.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource_loader_bridge.cc; sourceTree = "<group>"; }; 619BC9B49D39DC88F3826A9B /* RenderObjectChildList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderObjectChildList.cpp; sourceTree = "<group>"; }; 688FFA9B9CEFE9B1B66F8671 /* V8WebKitCSSMatrix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = V8WebKitCSSMatrix.cpp; sourceTree = "<group>"; }; 6A9898388068C93C5A7C011C /* ThreadTimers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadTimers.cpp; sourceTree = "<group>"; }; @@ -7675,6 +7681,7 @@ 825405280D92E3DA0006B936 /* resource_fetcher.h */, 825405260D92E3DA0006B936 /* resource_fetcher_unittest.cc */, 825405290D92E3DA0006B936 /* resource_handle_impl.cc */, + 5D2A55FF5C399F9800256956 /* resource_loader_bridge.cc */, 8254052A0D92E3DA0006B936 /* resource_loader_bridge.h */, 8254052B0D92E3DA0006B936 /* resource_type.h */, 8254052C0D92E3DA0006B936 /* searchable_form_data.cc */, @@ -7712,6 +7719,7 @@ 825405490D92E3DB0006B936 /* webkit_resources.rc */, 8254054A0D92E3DB0006B936 /* webkit_strings.grd */, 8254054F0D92E3DB0006B936 /* webplugin.h */, + 1459AC310DEBF6A597167F45 /* webplugin_delegate.cc */, 8254054B0D92E3DB0006B936 /* webplugin_delegate.h */, AB9552750F37AA2E0015C8FB /* webplugin_impl.cc */, 8254054E0D92E3DB0006B936 /* webplugin_impl.h */, @@ -7726,6 +7734,7 @@ 825405560D92E3DB0006B936 /* weburlrequest_impl.cc */, 825405570D92E3DB0006B936 /* weburlrequest_impl.h */, 8254055C0D92E3DB0006B936 /* webview.h */, + 4A48A12D02638BF9107FD26D /* webview_delegate.cc */, 825405590D92E3DB0006B936 /* webview_delegate.h */, 8254055A0D92E3DB0006B936 /* webview_impl.cc */, 8254055B0D92E3DB0006B936 /* webview_impl.h */, @@ -9610,6 +9619,7 @@ 8255CEC20F16971600E53C11 /* plugin_string_stream.cc in Sources */, E45626F80E268F03005E4685 /* resource_fetcher.cc in Sources */, E45627160E268F26005E4685 /* resource_handle_impl.cc in Sources */, + E7CC722700DA5F7E55527582 /* resource_loader_bridge.cc in Sources */, E456270C0E268F03005E4685 /* searchable_form_data.cc in Sources */, AB9552AE0F37AC0B0015C8FB /* stacking_order_iterator.cc in Sources */, 4DB043A40EB1577900A5633C /* webcursor.cc in Sources */, @@ -9623,9 +9633,11 @@ E45627050E268F03005E4685 /* webinputevent_mac.mm in Sources */, E45627090E268F03005E4685 /* webkit_glue.cc in Sources */, 93AF57990F0198CD0073C62D /* webkit_glue_mac.mm in Sources */, + B26072924B6C110181ECF928 /* webplugin_delegate.cc in Sources */, AB9552760F37AA2E0015C8FB /* webplugin_impl.cc in Sources */, E45627040E268F03005E4685 /* webtextinput_impl.cc in Sources */, E45627020E268F03005E4685 /* weburlrequest_impl.cc in Sources */, + 58E986F9F1CA5FC0A89313B0 /* webview_delegate.cc in Sources */, E45626F40E268F03005E4685 /* webview_impl.cc in Sources */, E45626F30E268F03005E4685 /* webwidget_impl.cc in Sources */, ABF923090F3A388C009B64EC /* webplugin_delegate_impl_mac.cc in Sources */, |