| 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 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 426 if (another) | 426 if (another) |
| 427 another->show(policy); | 427 another->show(policy); |
| 428 } | 428 } |
| 429 | 429 |
| 430 WebNavigationPolicy WebViewHost::decidePolicyForNavigation( | 430 WebNavigationPolicy WebViewHost::decidePolicyForNavigation( |
| 431 WebFrame*, const WebURLRequest&, WebNavigationType, WebNavigationPolicy defa
ultPolicy, bool) | 431 WebFrame*, const WebURLRequest&, WebNavigationType, WebNavigationPolicy defa
ultPolicy, bool) |
| 432 { | 432 { |
| 433 return defaultPolicy; | 433 return defaultPolicy; |
| 434 } | 434 } |
| 435 | 435 |
| 436 bool WebViewHost::canHandleRequest(WebFrame*, const WebURLRequest& request) | |
| 437 { | |
| 438 return true; | |
| 439 } | |
| 440 | |
| 441 WebURLError WebViewHost::cancelledError(WebFrame*, const WebURLRequest& request) | |
| 442 { | |
| 443 return webkit_support::CreateCancelledError(request); | |
| 444 } | |
| 445 | |
| 446 void WebViewHost::unableToImplementPolicyWithError(WebFrame* frame, const WebURL
Error& error) | |
| 447 { | |
| 448 } | |
| 449 | |
| 450 void WebViewHost::didCreateDataSource(WebFrame*, WebDataSource* ds) | 436 void WebViewHost::didCreateDataSource(WebFrame*, WebDataSource* ds) |
| 451 { | 437 { |
| 452 ds->setExtraData(m_pendingExtraData.leakPtr()); | 438 ds->setExtraData(m_pendingExtraData.leakPtr()); |
| 453 } | 439 } |
| 454 | 440 |
| 455 void WebViewHost::didCommitProvisionalLoad(WebFrame* frame, bool isNewNavigation
) | 441 void WebViewHost::didCommitProvisionalLoad(WebFrame* frame, bool isNewNavigation
) |
| 456 { | 442 { |
| 457 updateForCommittedLoad(frame, isNewNavigation); | 443 updateForCommittedLoad(frame, isNewNavigation); |
| 458 } | 444 } |
| 459 | 445 |
| (...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 993 } | 979 } |
| 994 | 980 |
| 995 #if ENABLE(MEDIA_STREAM) | 981 #if ENABLE(MEDIA_STREAM) |
| 996 webkit_support::TestMediaStreamClient* WebViewHost::testMediaStreamClient() | 982 webkit_support::TestMediaStreamClient* WebViewHost::testMediaStreamClient() |
| 997 { | 983 { |
| 998 if (!m_testMediaStreamClient.get()) | 984 if (!m_testMediaStreamClient.get()) |
| 999 m_testMediaStreamClient = adoptPtr(new webkit_support::TestMediaStreamCl
ient()); | 985 m_testMediaStreamClient = adoptPtr(new webkit_support::TestMediaStreamCl
ient()); |
| 1000 return m_testMediaStreamClient.get(); | 986 return m_testMediaStreamClient.get(); |
| 1001 } | 987 } |
| 1002 #endif | 988 #endif |
| OLD | NEW |