| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2011 Apple Inc. All rights reserved. | 3 * Copyright (C) 2011 Apple Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 715 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 726 DocumentLoader* LocalFrameClientImpl::createDocumentLoader( | 726 DocumentLoader* LocalFrameClientImpl::createDocumentLoader( |
| 727 LocalFrame* frame, | 727 LocalFrame* frame, |
| 728 const ResourceRequest& request, | 728 const ResourceRequest& request, |
| 729 const SubstituteData& data, | 729 const SubstituteData& data, |
| 730 ClientRedirectPolicy clientRedirectPolicy) { | 730 ClientRedirectPolicy clientRedirectPolicy) { |
| 731 DCHECK(frame); | 731 DCHECK(frame); |
| 732 | 732 |
| 733 WebDataSourceImpl* ds = | 733 WebDataSourceImpl* ds = |
| 734 WebDataSourceImpl::create(frame, request, data, clientRedirectPolicy); | 734 WebDataSourceImpl::create(frame, request, data, clientRedirectPolicy); |
| 735 if (m_webFrame->client()) | 735 if (m_webFrame->client()) |
| 736 m_webFrame->client()->didCreateDataSource(m_webFrame, ds); | 736 m_webFrame->client()->didCreateDataSource(ds); |
| 737 return ds; | 737 return ds; |
| 738 } | 738 } |
| 739 | 739 |
| 740 String LocalFrameClientImpl::userAgent() { | 740 String LocalFrameClientImpl::userAgent() { |
| 741 WebString override = | 741 WebString override = |
| 742 m_webFrame->client() ? m_webFrame->client()->userAgentOverride() : ""; | 742 m_webFrame->client() ? m_webFrame->client()->userAgentOverride() : ""; |
| 743 if (!override.isEmpty()) | 743 if (!override.isEmpty()) |
| 744 return override; | 744 return override; |
| 745 | 745 |
| 746 if (m_userAgent.isEmpty()) | 746 if (m_userAgent.isEmpty()) |
| (...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1033 if (m_webFrame->client()) | 1033 if (m_webFrame->client()) |
| 1034 m_webFrame->client()->setHasReceivedUserGesture(); | 1034 m_webFrame->client()->setHasReceivedUserGesture(); |
| 1035 } | 1035 } |
| 1036 | 1036 |
| 1037 void LocalFrameClientImpl::abortClientNavigation() { | 1037 void LocalFrameClientImpl::abortClientNavigation() { |
| 1038 if (m_webFrame->client()) | 1038 if (m_webFrame->client()) |
| 1039 m_webFrame->client()->abortClientNavigation(); | 1039 m_webFrame->client()->abortClientNavigation(); |
| 1040 } | 1040 } |
| 1041 | 1041 |
| 1042 } // namespace blink | 1042 } // namespace blink |
| OLD | NEW |