| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010, 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2010, 2011, 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 428 } | 428 } |
| 429 | 429 |
| 430 WebNavigationPolicy WebViewHost::decidePolicyForNavigation( | 430 WebNavigationPolicy WebViewHost::decidePolicyForNavigation( |
| 431 WebFrame*, const WebURLRequest&, | 431 WebFrame*, const WebURLRequest&, |
| 432 WebNavigationType, const WebNode&, | 432 WebNavigationType, const WebNode&, |
| 433 WebNavigationPolicy defaultPolicy, bool) | 433 WebNavigationPolicy defaultPolicy, bool) |
| 434 { | 434 { |
| 435 return defaultPolicy; | 435 return defaultPolicy; |
| 436 } | 436 } |
| 437 | 437 |
| 438 bool WebViewHost::canHandleRequest(WebFrame*, const WebURLRequest& request) | |
| 439 { | |
| 440 return true; | |
| 441 } | |
| 442 | |
| 443 WebURLError WebViewHost::cancelledError(WebFrame*, const WebURLRequest& request) | |
| 444 { | |
| 445 return webkit_support::CreateCancelledError(request); | |
| 446 } | |
| 447 | |
| 448 void WebViewHost::unableToImplementPolicyWithError(WebFrame* frame, const WebURL
Error& error) | |
| 449 { | |
| 450 } | |
| 451 | |
| 452 void WebViewHost::didCreateDataSource(WebFrame*, WebDataSource* ds) | 438 void WebViewHost::didCreateDataSource(WebFrame*, WebDataSource* ds) |
| 453 { | 439 { |
| 454 ds->setExtraData(m_pendingExtraData.leakPtr()); | 440 ds->setExtraData(m_pendingExtraData.leakPtr()); |
| 455 } | 441 } |
| 456 | 442 |
| 457 void WebViewHost::didCommitProvisionalLoad(WebFrame* frame, bool isNewNavigation
) | 443 void WebViewHost::didCommitProvisionalLoad(WebFrame* frame, bool isNewNavigation
) |
| 458 { | 444 { |
| 459 updateForCommittedLoad(frame, isNewNavigation); | 445 updateForCommittedLoad(frame, isNewNavigation); |
| 460 } | 446 } |
| 461 | 447 |
| (...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 995 } | 981 } |
| 996 | 982 |
| 997 #if ENABLE(MEDIA_STREAM) | 983 #if ENABLE(MEDIA_STREAM) |
| 998 webkit_support::TestMediaStreamClient* WebViewHost::testMediaStreamClient() | 984 webkit_support::TestMediaStreamClient* WebViewHost::testMediaStreamClient() |
| 999 { | 985 { |
| 1000 if (!m_testMediaStreamClient.get()) | 986 if (!m_testMediaStreamClient.get()) |
| 1001 m_testMediaStreamClient = adoptPtr(new webkit_support::TestMediaStreamCl
ient()); | 987 m_testMediaStreamClient = adoptPtr(new webkit_support::TestMediaStreamCl
ient()); |
| 1002 return m_testMediaStreamClient.get(); | 988 return m_testMediaStreamClient.get(); |
| 1003 } | 989 } |
| 1004 #endif | 990 #endif |
| OLD | NEW |