| 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 575 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 586 m_webFrame->client()->didCreateDataSource(m_webFrame, ds.get()); | 586 m_webFrame->client()->didCreateDataSource(m_webFrame, ds.get()); |
| 587 return ds.release(); | 587 return ds.release(); |
| 588 } | 588 } |
| 589 | 589 |
| 590 String FrameLoaderClientImpl::userAgent(const KURL& url) | 590 String FrameLoaderClientImpl::userAgent(const KURL& url) |
| 591 { | 591 { |
| 592 WebString override = m_webFrame->client()->userAgentOverride(m_webFrame, Web
URL(url)); | 592 WebString override = m_webFrame->client()->userAgentOverride(m_webFrame, Web
URL(url)); |
| 593 if (!override.isEmpty()) | 593 if (!override.isEmpty()) |
| 594 return override; | 594 return override; |
| 595 | 595 |
| 596 return blink::Platform::current()->userAgent(url); | 596 return blink::Platform::current()->userAgent(); |
| 597 } | 597 } |
| 598 | 598 |
| 599 String FrameLoaderClientImpl::doNotTrackValue() | 599 String FrameLoaderClientImpl::doNotTrackValue() |
| 600 { | 600 { |
| 601 WebString doNotTrack = m_webFrame->client()->doNotTrackValue(m_webFrame); | 601 WebString doNotTrack = m_webFrame->client()->doNotTrackValue(m_webFrame); |
| 602 if (!doNotTrack.isEmpty()) | 602 if (!doNotTrack.isEmpty()) |
| 603 return doNotTrack; | 603 return doNotTrack; |
| 604 return String(); | 604 return String(); |
| 605 } | 605 } |
| 606 | 606 |
| (...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 801 return adoptPtr(m_webFrame->client()->createApplicationCacheHost(m_webFrame,
client)); | 801 return adoptPtr(m_webFrame->client()->createApplicationCacheHost(m_webFrame,
client)); |
| 802 } | 802 } |
| 803 | 803 |
| 804 void FrameLoaderClientImpl::didStopAllLoaders() | 804 void FrameLoaderClientImpl::didStopAllLoaders() |
| 805 { | 805 { |
| 806 if (m_webFrame->client()) | 806 if (m_webFrame->client()) |
| 807 m_webFrame->client()->didAbortLoading(m_webFrame); | 807 m_webFrame->client()->didAbortLoading(m_webFrame); |
| 808 } | 808 } |
| 809 | 809 |
| 810 } // namespace blink | 810 } // namespace blink |
| OLD | NEW |