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

Side by Side Diff: third_party/WebKit/WebCore/loader/FrameLoaderClient.h

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 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 | Annotate | Revision Log
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 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) = 0; 200 const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) = 0;
201 virtual Widget* createPlugin(const IntSize&, HTMLPlugInElement*, const K URL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManu ally) = 0; 201 virtual Widget* createPlugin(const IntSize&, HTMLPlugInElement*, const K URL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManu ally) = 0;
202 virtual void redirectDataToPlugin(Widget* pluginWidget) = 0; 202 virtual void redirectDataToPlugin(Widget* pluginWidget) = 0;
203 203
204 virtual Widget* createJavaAppletWidget(const IntSize&, HTMLAppletElement *, const KURL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues) = 0; 204 virtual Widget* createJavaAppletWidget(const IntSize&, HTMLAppletElement *, const KURL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues) = 0;
205 205
206 virtual ObjectContentType objectContentType(const KURL& url, const Strin g& mimeType) = 0; 206 virtual ObjectContentType objectContentType(const KURL& url, const Strin g& mimeType) = 0;
207 virtual String overrideMediaType() const = 0; 207 virtual String overrideMediaType() const = 0;
208 208
209 virtual void windowObjectCleared() = 0; 209 virtual void windowObjectCleared() = 0;
210 virtual void documentElementAvailable() = 0;
211 virtual void didPerformFirstNavigation() const = 0; // "Navigation" here means a transition from one page to another that ends up in the back/forward li st. 210 virtual void didPerformFirstNavigation() const = 0; // "Navigation" here means a transition from one page to another that ends up in the back/forward li st.
212 211
213 virtual void registerForIconNotification(bool listen = true) = 0; 212 virtual void registerForIconNotification(bool listen = true) = 0;
214 213
215 #if PLATFORM(MAC) 214 #if PLATFORM(MAC)
216 #if ENABLE(MAC_JAVA_BRIDGE) 215 #if ENABLE(MAC_JAVA_BRIDGE)
217 virtual jobject javaApplet(NSView*) { return 0; } 216 virtual jobject javaApplet(NSView*) { return 0; }
218 #endif 217 #endif
219 virtual NSCachedURLResponse* willCacheResponse(DocumentLoader*, unsigned long identifier, NSCachedURLResponse*) const = 0; 218 virtual NSCachedURLResponse* willCacheResponse(DocumentLoader*, unsigned long identifier, NSCachedURLResponse*) const = 0;
220 #endif 219 #endif
221 220
222 virtual bool shouldUsePluginDocument(const String& /*mimeType*/) const { return false; } 221 virtual bool shouldUsePluginDocument(const String& /*mimeType*/) const { return false; }
223 }; 222 };
224 223
225 } // namespace WebCore 224 } // namespace WebCore
226 225
227 #endif // FrameLoaderClient_h 226 #endif // FrameLoaderClient_h
228 227
229 228
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/loader/FrameLoader.cpp ('k') | third_party/WebKit/WebCore/loader/MediaDocument.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698