| Index: chrome/browser/prerender/prerender_resource_throttle.h
|
| diff --git a/chrome/browser/prerender/prerender_resource_throttle.h b/chrome/browser/prerender/prerender_resource_throttle.h
|
| index 8a691d12c8883746f780588f463e361deed7ce9a..3d2a43c7224d57f4a26083d52c9401d06b290d51 100644
|
| --- a/chrome/browser/prerender/prerender_resource_throttle.h
|
| +++ b/chrome/browser/prerender/prerender_resource_throttle.h
|
| @@ -9,7 +9,7 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "content/public/browser/resource_throttle.h"
|
| -#include "webkit/common/resource_type.h"
|
| +#include "content/public/common/resource_type.h"
|
|
|
| namespace net {
|
| class URLRequest;
|
| @@ -49,7 +49,7 @@ class PrerenderResourceThrottle
|
| static void WillStartRequestOnUI(
|
| const base::WeakPtr<PrerenderResourceThrottle>& throttle,
|
| const std::string& method,
|
| - ResourceType::Type resource_type,
|
| + content::ResourceType::Type resource_type,
|
| int render_process_id,
|
| int render_frame_id,
|
| const GURL& url);
|
| @@ -57,7 +57,7 @@ class PrerenderResourceThrottle
|
| static void WillRedirectRequestOnUI(
|
| const base::WeakPtr<PrerenderResourceThrottle>& throttle,
|
| const std::string& follow_only_when_prerender_shown_header,
|
| - ResourceType::Type resource_type,
|
| + content::ResourceType::Type resource_type,
|
| bool async,
|
| int render_process_id,
|
| int render_frame_id,
|
|
|