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

Side by Side Diff: Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h

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) 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2010 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 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 virtual void willChangeTitle(WebCore::DocumentLoader*); 125 virtual void willChangeTitle(WebCore::DocumentLoader*);
126 virtual void didChangeTitle(WebCore::DocumentLoader*); 126 virtual void didChangeTitle(WebCore::DocumentLoader*);
127 127
128 virtual void committedLoad(WebCore::DocumentLoader*, const char*, int); 128 virtual void committedLoad(WebCore::DocumentLoader*, const char*, int);
129 virtual void finishedLoading(WebCore::DocumentLoader*); 129 virtual void finishedLoading(WebCore::DocumentLoader*);
130 130
131 virtual void updateGlobalHistory(); 131 virtual void updateGlobalHistory();
132 virtual void updateGlobalHistoryRedirectLinks(); 132 virtual void updateGlobalHistoryRedirectLinks();
133 133
134 virtual bool shouldGoToHistoryItem(WebCore::HistoryItem*) const; 134 virtual bool shouldGoToHistoryItem(WebCore::HistoryItem*) const;
135 virtual bool shouldStopLoadingForHistoryItem(WebCore::HistoryItem*) const;
135 virtual void dispatchDidAddBackForwardItem(WebCore::HistoryItem*) const; 136 virtual void dispatchDidAddBackForwardItem(WebCore::HistoryItem*) const;
136 virtual void dispatchDidRemoveBackForwardItem(WebCore::HistoryItem*) const; 137 virtual void dispatchDidRemoveBackForwardItem(WebCore::HistoryItem*) const;
137 virtual void dispatchDidChangeBackForwardIndex() const; 138 virtual void dispatchDidChangeBackForwardIndex() const;
138 139
139 virtual void didDisplayInsecureContent(); 140 virtual void didDisplayInsecureContent();
140 virtual void didRunInsecureContent(WebCore::SecurityOrigin*); 141 virtual void didRunInsecureContent(WebCore::SecurityOrigin*);
141 142
142 virtual WebCore::ResourceError cancelledError(const WebCore::ResourceRequest &); 143 virtual WebCore::ResourceError cancelledError(const WebCore::ResourceRequest &);
143 virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) ; 144 virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) ;
144 virtual WebCore::ResourceError cannotShowURLError(const WebCore::ResourceReq uest&); 145 virtual WebCore::ResourceError cannotShowURLError(const WebCore::ResourceReq uest&);
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 bool m_hasSentResponseToPluginView; 222 bool m_hasSentResponseToPluginView;
222 bool m_frameHasCustomRepresentation; 223 bool m_frameHasCustomRepresentation;
223 }; 224 };
224 225
225 uint32_t modifiersForNavigationAction(const WebCore::NavigationAction&); 226 uint32_t modifiersForNavigationAction(const WebCore::NavigationAction&);
226 int32_t mouseButtonForNavigationAction(const WebCore::NavigationAction&); 227 int32_t mouseButtonForNavigationAction(const WebCore::NavigationAction&);
227 228
228 } // namespace WebKit 229 } // namespace WebKit
229 230
230 #endif // WebFrameLoaderClient_h 231 #endif // WebFrameLoaderClient_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698