| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights |
| 3 * reserved. | 3 * reserved. |
| 4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
| 5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. | 5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. |
| 6 * (http://www.torchmobile.com/) | 6 * (http://www.torchmobile.com/) |
| 7 * Copyright (C) 2008 Alp Toker <alp@atoker.com> | 7 * Copyright (C) 2008 Alp Toker <alp@atoker.com> |
| 8 * Copyright (C) Research In Motion Limited 2009. All rights reserved. | 8 * Copyright (C) Research In Motion Limited 2009. All rights reserved. |
| 9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> | 9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> |
| 10 * Copyright (C) 2011 Google Inc. All rights reserved. | 10 * Copyright (C) 2011 Google Inc. All rights reserved. |
| (...skipping 1435 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1446 is_client_redirect, form, | 1446 is_client_redirect, form, |
| 1447 should_check_main_world_content_security_policy); | 1447 should_check_main_world_content_security_policy); |
| 1448 if (policy == kNavigationPolicyCurrentTab || | 1448 if (policy == kNavigationPolicyCurrentTab || |
| 1449 policy == kNavigationPolicyIgnore || | 1449 policy == kNavigationPolicyIgnore || |
| 1450 policy == kNavigationPolicyHandledByClient || | 1450 policy == kNavigationPolicyHandledByClient || |
| 1451 policy == kNavigationPolicyHandledByClientForInitialHistory) { | 1451 policy == kNavigationPolicyHandledByClientForInitialHistory) { |
| 1452 return policy; | 1452 return policy; |
| 1453 } | 1453 } |
| 1454 | 1454 |
| 1455 if (!LocalDOMWindow::AllowPopUp(*frame_) && | 1455 if (!LocalDOMWindow::AllowPopUp(*frame_) && |
| 1456 !UserGestureIndicator::UtilizeUserGesture()) | 1456 !UserGestureIndicator::ProcessingUserGesture()) |
| 1457 return kNavigationPolicyIgnore; | 1457 return kNavigationPolicyIgnore; |
| 1458 Client()->LoadURLExternally(request, policy, String(), | 1458 Client()->LoadURLExternally(request, policy, String(), |
| 1459 replaces_current_history_item); | 1459 replaces_current_history_item); |
| 1460 return kNavigationPolicyIgnore; | 1460 return kNavigationPolicyIgnore; |
| 1461 } | 1461 } |
| 1462 | 1462 |
| 1463 NavigationPolicy FrameLoader::ShouldContinueForRedirectNavigationPolicy( | 1463 NavigationPolicy FrameLoader::ShouldContinueForRedirectNavigationPolicy( |
| 1464 const ResourceRequest& request, | 1464 const ResourceRequest& request, |
| 1465 const SubstituteData& substitute_data, | 1465 const SubstituteData& substitute_data, |
| 1466 DocumentLoader* loader, | 1466 DocumentLoader* loader, |
| (...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1834 // TODO(japhet): This is needed because the browser process DCHECKs if the | 1834 // TODO(japhet): This is needed because the browser process DCHECKs if the |
| 1835 // first entry we commit in a new frame has replacement set. It's unclear | 1835 // first entry we commit in a new frame has replacement set. It's unclear |
| 1836 // whether the DCHECK is right, investigate removing this special case. | 1836 // whether the DCHECK is right, investigate removing this special case. |
| 1837 bool replace_current_item = load_type == kFrameLoadTypeReplaceCurrentItem && | 1837 bool replace_current_item = load_type == kFrameLoadTypeReplaceCurrentItem && |
| 1838 (!Opener() || !request.Url().IsEmpty()); | 1838 (!Opener() || !request.Url().IsEmpty()); |
| 1839 loader->SetReplacesCurrentHistoryItem(replace_current_item); | 1839 loader->SetReplacesCurrentHistoryItem(replace_current_item); |
| 1840 return loader; | 1840 return loader; |
| 1841 } | 1841 } |
| 1842 | 1842 |
| 1843 } // namespace blink | 1843 } // namespace blink |
| OLD | NEW |