| 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 750 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 761 } | 761 } |
| 762 | 762 |
| 763 void WebFrameLoaderClient::dispatchDidCommitLoad() { | 763 void WebFrameLoaderClient::dispatchDidCommitLoad() { |
| 764 WebViewImpl* webview = webframe_->webview_impl(); | 764 WebViewImpl* webview = webframe_->webview_impl(); |
| 765 | 765 |
| 766 bool is_new_navigation; | 766 bool is_new_navigation; |
| 767 webview->DidCommitLoad(&is_new_navigation); | 767 webview->DidCommitLoad(&is_new_navigation); |
| 768 WebViewDelegate* d = webview->delegate(); | 768 WebViewDelegate* d = webview->delegate(); |
| 769 if (d) | 769 if (d) |
| 770 d->DidCommitLoadForFrame(webview, webframe_, is_new_navigation); | 770 d->DidCommitLoadForFrame(webview, webframe_, is_new_navigation); |
| 771 |
| 772 WebDevToolsAgentImpl* tools_agent = webview->GetWebDevToolsAgentImpl(); |
| 773 if (tools_agent) { |
| 774 tools_agent->DidCommitLoadForFrame(webview, webframe_, is_new_navigation); |
| 775 } |
| 771 } | 776 } |
| 772 | 777 |
| 773 void WebFrameLoaderClient::dispatchDidFailProvisionalLoad( | 778 void WebFrameLoaderClient::dispatchDidFailProvisionalLoad( |
| 774 const ResourceError& error) { | 779 const ResourceError& error) { |
| 775 // If a policy change occured, then we do not want to inform the plugin | 780 // If a policy change occured, then we do not want to inform the plugin |
| 776 // delegate. See bug 907789 for details. | 781 // delegate. See bug 907789 for details. |
| 777 if (error.domain() == kInternalErrorDomain && | 782 if (error.domain() == kInternalErrorDomain && |
| 778 error.errorCode() == ERR_POLICY_CHANGE) { | 783 error.errorCode() == ERR_POLICY_CHANGE) { |
| 779 webframe_->DidFail(cancelledError(error.failingURL()), true); | 784 webframe_->DidFail(cancelledError(error.failingURL()), true); |
| 780 } else { | 785 } else { |
| (...skipping 796 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1577 if (!web_view) { | 1582 if (!web_view) { |
| 1578 return NULL; | 1583 return NULL; |
| 1579 } | 1584 } |
| 1580 WebDevToolsAgentImpl* tools_agent = web_view->GetWebDevToolsAgentImpl(); | 1585 WebDevToolsAgentImpl* tools_agent = web_view->GetWebDevToolsAgentImpl(); |
| 1581 if (tools_agent) { | 1586 if (tools_agent) { |
| 1582 return tools_agent->net_agent_impl(); | 1587 return tools_agent->net_agent_impl(); |
| 1583 } else { | 1588 } else { |
| 1584 return NULL; | 1589 return NULL; |
| 1585 } | 1590 } |
| 1586 } | 1591 } |
| OLD | NEW |