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

Side by Side Diff: third_party/WebKit/Source/core/loader/EmptyClients.h

Issue 1497423002: Revert of Downgrade lock icon for broken-HTTPS subresources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix conflict Created 5 years 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 Eric Seidel (eric@webkit.org) 2 * Copyright (C) 2006 Eric Seidel (eric@webkit.org)
3 * Copyright (C) 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 3 * Copyright (C) 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
4 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 4 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
5 * Copyright (C) 2012 Samsung Electronics. All rights reserved. 5 * Copyright (C) 2012 Samsung Electronics. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 227
228 String doNotTrackValue() override { return String(); } 228 String doNotTrackValue() override { return String(); }
229 229
230 void transitionToCommittedForNewPage() override {} 230 void transitionToCommittedForNewPage() override {}
231 231
232 bool navigateBackForward(int offset) const override { return false; } 232 bool navigateBackForward(int offset) const override { return false; }
233 void didDisplayInsecureContent() override {} 233 void didDisplayInsecureContent() override {}
234 void didRunInsecureContent(SecurityOrigin*, const KURL&) override {} 234 void didRunInsecureContent(SecurityOrigin*, const KURL&) override {}
235 void didDetectXSS(const KURL&, bool) override {} 235 void didDetectXSS(const KURL&, bool) override {}
236 void didDispatchPingLoader(const KURL&) override {} 236 void didDispatchPingLoader(const KURL&) override {}
237 void didDisplayContentWithCertificateErrors(const KURL&, const CString&, con st WebURL& mainResourceUrl, const CString& mainResourceSecurityInfo) override {}
238 void didRunContentWithCertificateErrors(const KURL&, const CString&, const W ebURL& mainResourceUrl, const CString& mainResourceSecurityInfo) override {}
239 void selectorMatchChanged(const Vector<String>&, const Vector<String>&) over ride {} 237 void selectorMatchChanged(const Vector<String>&, const Vector<String>&) over ride {}
240 PassRefPtrWillBeRawPtr<LocalFrame> createFrame(const FrameLoadRequest&, cons t AtomicString&, HTMLFrameOwnerElement*) override; 238 PassRefPtrWillBeRawPtr<LocalFrame> createFrame(const FrameLoadRequest&, cons t AtomicString&, HTMLFrameOwnerElement*) override;
241 PassRefPtrWillBeRawPtr<Widget> createPlugin(HTMLPlugInElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool, DetachedPlug inPolicy) override; 239 PassRefPtrWillBeRawPtr<Widget> createPlugin(HTMLPlugInElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool, DetachedPlug inPolicy) override;
242 bool canCreatePluginWithoutRenderer(const String& mimeType) const override { return false; } 240 bool canCreatePluginWithoutRenderer(const String& mimeType) const override { return false; }
243 PassOwnPtr<WebMediaPlayer> createWebMediaPlayer(HTMLMediaElement&, const Web URL&, WebMediaPlayerClient*) override; 241 PassOwnPtr<WebMediaPlayer> createWebMediaPlayer(HTMLMediaElement&, const Web URL&, WebMediaPlayerClient*) override;
244 PassOwnPtr<WebMediaSession> createWebMediaSession() override; 242 PassOwnPtr<WebMediaSession> createWebMediaSession() override;
245 243
246 ObjectContentType objectContentType(const KURL&, const String&, bool) overri de { return ObjectContentType(); } 244 ObjectContentType objectContentType(const KURL&, const String&, bool) overri de { return ObjectContentType(); }
247 245
248 void didCreateNewDocument() override {} 246 void didCreateNewDocument() override {}
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 ~EmptyDragClient() override {} 326 ~EmptyDragClient() override {}
329 DragDestinationAction actionMaskForDrag(DragData*) override { return DragDes tinationActionNone; } 327 DragDestinationAction actionMaskForDrag(DragData*) override { return DragDes tinationActionNone; }
330 void startDrag(DragImage*, const IntPoint&, const IntPoint&, DataTransfer*, LocalFrame*, bool) override {} 328 void startDrag(DragImage*, const IntPoint&, const IntPoint&, DataTransfer*, LocalFrame*, bool) override {}
331 }; 329 };
332 330
333 CORE_EXPORT void fillWithEmptyClients(Page::PageClients&); 331 CORE_EXPORT void fillWithEmptyClients(Page::PageClients&);
334 332
335 } // namespace blink 333 } // namespace blink
336 334
337 #endif // EmptyClients_h 335 #endif // EmptyClients_h
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | third_party/WebKit/Source/core/loader/FrameFetchContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698