| OLD | NEW | 
|---|
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "config.h" | 5 #include "config.h" | 
| 6 #include <string> | 6 #include <string> | 
| 7 #include <vector> | 7 #include <vector> | 
| 8 | 8 | 
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" | 
| 10 | 10 | 
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 43 #if defined(OS_WIN) | 43 #if defined(OS_WIN) | 
| 44 #include "webkit/activex_shim/activex_shared.h" | 44 #include "webkit/activex_shim/activex_shared.h" | 
| 45 #endif | 45 #endif | 
| 46 #include "webkit/glue/autofill_form.h" | 46 #include "webkit/glue/autofill_form.h" | 
| 47 #include "webkit/glue/alt_404_page_resource_fetcher.h" | 47 #include "webkit/glue/alt_404_page_resource_fetcher.h" | 
| 48 #include "webkit/glue/devtools/net_agent_impl.h" | 48 #include "webkit/glue/devtools/net_agent_impl.h" | 
| 49 #include "webkit/glue/glue_util.h" | 49 #include "webkit/glue/glue_util.h" | 
| 50 #include "webkit/glue/password_form_dom_manager.h" | 50 #include "webkit/glue/password_form_dom_manager.h" | 
| 51 #include "webkit/glue/plugins/plugin_list.h" | 51 #include "webkit/glue/plugins/plugin_list.h" | 
| 52 #include "webkit/glue/searchable_form_data.h" | 52 #include "webkit/glue/searchable_form_data.h" | 
|  | 53 #include "webkit/glue/webappcachecontext.h" | 
| 53 #include "webkit/glue/webdatasource_impl.h" | 54 #include "webkit/glue/webdatasource_impl.h" | 
| 54 #include "webkit/glue/webdevtoolsagent_impl.h" | 55 #include "webkit/glue/webdevtoolsagent_impl.h" | 
| 55 #include "webkit/glue/weberror_impl.h" | 56 #include "webkit/glue/weberror_impl.h" | 
| 56 #include "webkit/glue/webframeloaderclient_impl.h" | 57 #include "webkit/glue/webframeloaderclient_impl.h" | 
| 57 #include "webkit/glue/webhistoryitem_impl.h" | 58 #include "webkit/glue/webhistoryitem_impl.h" | 
| 58 #include "webkit/glue/webkit_glue.h" | 59 #include "webkit/glue/webkit_glue.h" | 
| 59 #include "webkit/glue/webplugin_impl.h" | 60 #include "webkit/glue/webplugin_impl.h" | 
| 60 #include "webkit/glue/webresponse_impl.h" | 61 #include "webkit/glue/webresponse_impl.h" | 
| 61 #include "webkit/glue/webview_delegate.h" | 62 #include "webkit/glue/webview_delegate.h" | 
| 62 #include "webkit/glue/webview_impl.h" | 63 #include "webkit/glue/webview_impl.h" | 
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 227   WebViewDelegate* d = webview->delegate(); | 228   WebViewDelegate* d = webview->delegate(); | 
| 228   if (d) { | 229   if (d) { | 
| 229     WebRequestImpl webreq(request); | 230     WebRequestImpl webreq(request); | 
| 230     d->WillSendRequest(webview, identifier, &webreq); | 231     d->WillSendRequest(webview, identifier, &webreq); | 
| 231     request = webreq.frame_load_request().resourceRequest(); | 232     request = webreq.frame_load_request().resourceRequest(); | 
| 232   } | 233   } | 
| 233   NetAgentImpl* net_agent = GetNetAgentImpl(); | 234   NetAgentImpl* net_agent = GetNetAgentImpl(); | 
| 234   if (net_agent) { | 235   if (net_agent) { | 
| 235     net_agent->WillSendRequest(loader, identifier, request); | 236     net_agent->WillSendRequest(loader, identifier, request); | 
| 236   } | 237   } | 
|  | 238 | 
|  | 239   request.setAppCacheContextID(webframe_->GetAppCacheContext()->context_id()); | 
| 237 } | 240 } | 
| 238 | 241 | 
| 239 bool WebFrameLoaderClient::shouldUseCredentialStorage(DocumentLoader*, | 242 bool WebFrameLoaderClient::shouldUseCredentialStorage(DocumentLoader*, | 
| 240     unsigned long identifier) { | 243     unsigned long identifier) { | 
| 241   // FIXME | 244   // FIXME | 
| 242   // Intended to pass through to a method on the resource load delegate. | 245   // Intended to pass through to a method on the resource load delegate. | 
| 243   // If implemented, that method controls whether the browser should ask the | 246   // If implemented, that method controls whether the browser should ask the | 
| 244   // networking layer for a stored default credential for the page (say from | 247   // networking layer for a stored default credential for the page (say from | 
| 245   // the Mac OS keychain). If the method returns false, the user should be | 248   // the Mac OS keychain). If the method returns false, the user should be | 
| 246   // presented with an authentication challenge whether or not the networking | 249   // presented with an authentication challenge whether or not the networking | 
| (...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 778 void WebFrameLoaderClient::dispatchDidReceiveTitle(const String& title) { | 781 void WebFrameLoaderClient::dispatchDidReceiveTitle(const String& title) { | 
| 779   WebViewImpl* webview = webframe_->webview_impl(); | 782   WebViewImpl* webview = webframe_->webview_impl(); | 
| 780   WebViewDelegate* d = webview->delegate(); | 783   WebViewDelegate* d = webview->delegate(); | 
| 781   if (d) { | 784   if (d) { | 
| 782     d->DidReceiveTitle(webview, webkit_glue::StringToStdWString(title), | 785     d->DidReceiveTitle(webview, webkit_glue::StringToStdWString(title), | 
| 783                        webframe_); | 786                        webframe_); | 
| 784   } | 787   } | 
| 785 } | 788 } | 
| 786 | 789 | 
| 787 void WebFrameLoaderClient::dispatchDidCommitLoad() { | 790 void WebFrameLoaderClient::dispatchDidCommitLoad() { | 
|  | 791   webframe_->SelectAppCacheWithoutManifest(); | 
|  | 792 | 
| 788   WebViewImpl* webview = webframe_->webview_impl(); | 793   WebViewImpl* webview = webframe_->webview_impl(); | 
| 789 |  | 
| 790   bool is_new_navigation; | 794   bool is_new_navigation; | 
| 791   webview->DidCommitLoad(&is_new_navigation); | 795   webview->DidCommitLoad(&is_new_navigation); | 
| 792   WebViewDelegate* d = webview->delegate(); | 796   WebViewDelegate* d = webview->delegate(); | 
| 793   if (d) | 797   if (d) | 
| 794     d->DidCommitLoadForFrame(webview, webframe_, is_new_navigation); | 798     d->DidCommitLoadForFrame(webview, webframe_, is_new_navigation); | 
| 795 | 799 | 
| 796   WebDevToolsAgentImpl* tools_agent = webview->GetWebDevToolsAgentImpl(); | 800   WebDevToolsAgentImpl* tools_agent = webview->GetWebDevToolsAgentImpl(); | 
| 797   if (tools_agent) { | 801   if (tools_agent) { | 
| 798     tools_agent->DidCommitLoadForFrame(webview, webframe_, is_new_navigation); | 802     tools_agent->DidCommitLoadForFrame(webview, webframe_, is_new_navigation); | 
| 799   } | 803   } | 
| (...skipping 798 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1598   if (!web_view) { | 1602   if (!web_view) { | 
| 1599     return NULL; | 1603     return NULL; | 
| 1600   } | 1604   } | 
| 1601   WebDevToolsAgentImpl* tools_agent = web_view->GetWebDevToolsAgentImpl(); | 1605   WebDevToolsAgentImpl* tools_agent = web_view->GetWebDevToolsAgentImpl(); | 
| 1602   if (tools_agent) { | 1606   if (tools_agent) { | 
| 1603     return tools_agent->net_agent_impl(); | 1607     return tools_agent->net_agent_impl(); | 
| 1604   } else { | 1608   } else { | 
| 1605     return NULL; | 1609     return NULL; | 
| 1606   } | 1610   } | 
| 1607 } | 1611 } | 
| OLD | NEW | 
|---|