| OLD | NEW |
| 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 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 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "Chrome.h" | 10 #include "Chrome.h" |
| (...skipping 969 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 980 | 980 |
| 981 void WebFrameLoaderClient::updateGlobalHistoryRedirectLinks() { | 981 void WebFrameLoaderClient::updateGlobalHistoryRedirectLinks() { |
| 982 } | 982 } |
| 983 | 983 |
| 984 bool WebFrameLoaderClient::shouldGoToHistoryItem(HistoryItem*) const { | 984 bool WebFrameLoaderClient::shouldGoToHistoryItem(HistoryItem*) const { |
| 985 // FIXME | 985 // FIXME |
| 986 return true; | 986 return true; |
| 987 } | 987 } |
| 988 | 988 |
| 989 void WebFrameLoaderClient::didDisplayInsecureContent() { | 989 void WebFrameLoaderClient::didDisplayInsecureContent() { |
| 990 if (webframe_->client()) |
| 991 webframe_->client()->didDisplayInsecureContent(webframe_); |
| 990 } | 992 } |
| 991 | 993 |
| 992 void WebFrameLoaderClient::didRunInsecureContent(SecurityOrigin*) { | 994 void WebFrameLoaderClient::didRunInsecureContent(SecurityOrigin* origin) { |
| 995 if (webframe_->client()) { |
| 996 webframe_->client()->didRunInsecureContent(webframe_, |
| 997 webkit_glue::StringToWebString(origin->toString())); |
| 998 } |
| 993 } | 999 } |
| 994 | 1000 |
| 995 ResourceError WebFrameLoaderClient::blockedError(const WebCore::ResourceRequest&
) { | 1001 ResourceError WebFrameLoaderClient::blockedError(const WebCore::ResourceRequest&
) { |
| 996 // FIXME | 1002 // FIXME |
| 997 return ResourceError(); | 1003 return ResourceError(); |
| 998 } | 1004 } |
| 999 | 1005 |
| 1000 ResourceError WebFrameLoaderClient::cancelledError( | 1006 ResourceError WebFrameLoaderClient::cancelledError( |
| 1001 const ResourceRequest& request) { | 1007 const ResourceRequest& request) { |
| 1002 return ResourceError(net::kErrorDomain, net::ERR_ABORTED, | 1008 return ResourceError(net::kErrorDomain, net::ERR_ABORTED, |
| (...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1332 WebViewDelegate* d = webframe_->GetWebViewImpl()->delegate(); | 1338 WebViewDelegate* d = webframe_->GetWebViewImpl()->delegate(); |
| 1333 if (d) | 1339 if (d) |
| 1334 d->NavigateBackForwardSoon(offset); | 1340 d->NavigateBackForwardSoon(offset); |
| 1335 } | 1341 } |
| 1336 | 1342 |
| 1337 PassOwnPtr<WebPluginLoadObserver> WebFrameLoaderClient::GetPluginLoadObserver()
{ | 1343 PassOwnPtr<WebPluginLoadObserver> WebFrameLoaderClient::GetPluginLoadObserver()
{ |
| 1338 WebDataSourceImpl* ds = WebDataSourceImpl::fromDocumentLoader( | 1344 WebDataSourceImpl* ds = WebDataSourceImpl::fromDocumentLoader( |
| 1339 webframe_->frame()->loader()->activeDocumentLoader()); | 1345 webframe_->frame()->loader()->activeDocumentLoader()); |
| 1340 return ds->releasePluginLoadObserver(); | 1346 return ds->releasePluginLoadObserver(); |
| 1341 } | 1347 } |
| OLD | NEW |