diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-28 01:29:20 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-28 01:29:20 +0000 |
| commit | e5d549d8889c0533703211652564bc0a55ec9938 (patch) | |
| tree | 1657b37fe9aab6dc719d2f4cc2298c42a8d92e62 /chrome/browser/renderer_host | |
| parent | 1f2f300c1767a21a17e1b9ce3acb4b75ae854600 (diff) | |
| download | chromium_src-e5d549d8889c0533703211652564bc0a55ec9938.zip chromium_src-e5d549d8889c0533703211652564bc0a55ec9938.tar.gz chromium_src-e5d549d8889c0533703211652564bc0a55ec9938.tar.bz2 | |
Move the PageNavigator interface and GlobalRequestID struct to content\public and put them in the content namespace. Make PageNavigator use WebContents instead of TabContents. While I'm touching all the callers, I've removed the deprecated PageNavigator function and converted users to the new one.
BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/8991012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115858 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host')
| -rw-r--r-- | chrome/browser/renderer_host/safe_browsing_resource_handler.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/renderer_host/transfer_navigation_resource_handler.cc | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/renderer_host/safe_browsing_resource_handler.cc b/chrome/browser/renderer_host/safe_browsing_resource_handler.cc index 2d97154..5827742 100644 --- a/chrome/browser/renderer_host/safe_browsing_resource_handler.cc +++ b/chrome/browser/renderer_host/safe_browsing_resource_handler.cc @@ -9,15 +9,17 @@ #include "chrome/browser/prerender/prerender_final_status.h" #include "chrome/browser/prerender/prerender_tracker.h" #include "chrome/browser/renderer_host/chrome_url_request_user_data.h" -#include "content/browser/renderer_host/global_request_id.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/renderer_host/resource_message_filter.h" +#include "content/public/browser/global_request_id.h" #include "content/public/common/resource_response.h" #include "net/base/io_buffer.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" #include "net/url_request/url_request.h" +using content::GlobalRequestID; + // Maximum time in milliseconds to wait for the safe browsing service to // verify a URL. After this amount of time the outstanding check will be // aborted, and the URL will be treated as if it were safe. diff --git a/chrome/browser/renderer_host/transfer_navigation_resource_handler.cc b/chrome/browser/renderer_host/transfer_navigation_resource_handler.cc index 38fa16b..25a04c3 100644 --- a/chrome/browser/renderer_host/transfer_navigation_resource_handler.cc +++ b/chrome/browser/renderer_host/transfer_navigation_resource_handler.cc @@ -14,6 +14,8 @@ #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "content/public/common/referrer.h" +using content::GlobalRequestID; + namespace { void RequestTransferURLOnUIThread(int render_process_id, |