| Index: chrome/browser/chrome_plugin_host.cc
|
| ===================================================================
|
| --- chrome/browser/chrome_plugin_host.cc (revision 23699)
|
| +++ chrome/browser/chrome_plugin_host.cc (working copy)
|
| @@ -192,8 +192,7 @@
|
| }
|
|
|
| // URLRequest::Delegate
|
| - virtual void OnReceivedRedirect(URLRequest* request, const GURL& new_url,
|
| - bool* defer_redirect) {
|
| + virtual void OnReceivedRedirect(URLRequest* request, const GURL& new_url) {
|
| plugin_->functions().response_funcs->received_redirect(
|
| cprequest_.get(), new_url.spec().c_str());
|
| }
|
|
|
| Property changes on: chrome\browser\chrome_plugin_host.cc
|
| ___________________________________________________________________
|
| Modified: svn:mergeinfo
|
| Reverse-merged /trunk/src/chrome/browser/chrome_plugin_host.cc:r15950,18210,19978,19995,21417,22284
|
| Merged /trunk/src/chrome/browser/chrome_plugin_host.cc:r22067
|
|
|
|
|