Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Side by Side Diff: Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm

Issue 6541090: Merge 79107 - 2011-02-19 Charlie Reis <creis@chromium.org>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 919 matching lines...) Expand 10 before | Expand all | Expand 10 after
930 } 930 }
931 931
932 bool WebFrameLoaderClient::shouldGoToHistoryItem(HistoryItem* item) const 932 bool WebFrameLoaderClient::shouldGoToHistoryItem(HistoryItem* item) const
933 { 933 {
934 WebView* view = getWebView(m_webFrame.get()); 934 WebView* view = getWebView(m_webFrame.get());
935 WebHistoryItem *webItem = kit(item); 935 WebHistoryItem *webItem = kit(item);
936 936
937 return [[view _policyDelegateForwarder] webView:view shouldGoToHistoryItem:w ebItem]; 937 return [[view _policyDelegateForwarder] webView:view shouldGoToHistoryItem:w ebItem];
938 } 938 }
939 939
940 bool WebFrameLoaderClient::shouldStopLoadingForHistoryItem(HistoryItem* item) co nst
941 {
942 return true;
943 }
944
940 void WebFrameLoaderClient::dispatchDidAddBackForwardItem(HistoryItem*) const 945 void WebFrameLoaderClient::dispatchDidAddBackForwardItem(HistoryItem*) const
941 { 946 {
942 } 947 }
943 948
944 void WebFrameLoaderClient::dispatchDidRemoveBackForwardItem(HistoryItem*) const 949 void WebFrameLoaderClient::dispatchDidRemoveBackForwardItem(HistoryItem*) const
945 { 950 {
946 } 951 }
947 952
948 void WebFrameLoaderClient::dispatchDidChangeBackForwardIndex() const 953 void WebFrameLoaderClient::dispatchDidChangeBackForwardIndex() const
949 { 954 {
(...skipping 1101 matching lines...) Expand 10 before | Expand all | Expand 10 after
2051 { 2056 {
2052 [self receivedPolicyDecision:PolicyUse]; 2057 [self receivedPolicyDecision:PolicyUse];
2053 } 2058 }
2054 2059
2055 - (void)continue 2060 - (void)continue
2056 { 2061 {
2057 [self receivedPolicyDecision:PolicyUse]; 2062 [self receivedPolicyDecision:PolicyUse];
2058 } 2063 }
2059 2064
2060 @end 2065 @end
OLDNEW
« no previous file with comments | « Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h ('k') | Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698