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

Side by Side Diff: third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

Issue 2461043003: Fix for the RedirectTest.ClientServerServer test. (Closed)
Patch Set: More build error fixes Created 4 years, 1 month 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) 2009, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
3 * Copyright (C) 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2011 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after
679 const Vector<String>& addedSelectors, 679 const Vector<String>& addedSelectors,
680 const Vector<String>& removedSelectors) { 680 const Vector<String>& removedSelectors) {
681 if (WebFrameClient* client = m_webFrame->client()) 681 if (WebFrameClient* client = m_webFrame->client())
682 client->didMatchCSS(m_webFrame, WebVector<WebString>(addedSelectors), 682 client->didMatchCSS(m_webFrame, WebVector<WebString>(addedSelectors),
683 WebVector<WebString>(removedSelectors)); 683 WebVector<WebString>(removedSelectors));
684 } 684 }
685 685
686 DocumentLoader* FrameLoaderClientImpl::createDocumentLoader( 686 DocumentLoader* FrameLoaderClientImpl::createDocumentLoader(
687 LocalFrame* frame, 687 LocalFrame* frame,
688 const ResourceRequest& request, 688 const ResourceRequest& request,
689 const SubstituteData& data) { 689 const SubstituteData& data,
690 WebDataSourceImpl* ds = WebDataSourceImpl::create(frame, request, data); 690 ClientRedirectPolicy clientRedirectPolicy) {
691 WebDataSourceImpl* ds =
692 WebDataSourceImpl::create(frame, request, data, clientRedirectPolicy);
691 if (m_webFrame->client()) 693 if (m_webFrame->client())
692 m_webFrame->client()->didCreateDataSource(m_webFrame, ds); 694 m_webFrame->client()->didCreateDataSource(m_webFrame, ds);
693 return ds; 695 return ds;
694 } 696 }
695 697
696 String FrameLoaderClientImpl::userAgent() { 698 String FrameLoaderClientImpl::userAgent() {
697 WebString override = 699 WebString override =
698 m_webFrame->client() ? m_webFrame->client()->userAgentOverride() : ""; 700 m_webFrame->client() ? m_webFrame->client()->userAgentOverride() : "";
699 if (!override.isEmpty()) 701 if (!override.isEmpty())
700 return override; 702 return override;
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
983 WebDevToolsAgentImpl* FrameLoaderClientImpl::devToolsAgent() { 985 WebDevToolsAgentImpl* FrameLoaderClientImpl::devToolsAgent() {
984 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot()) 986 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot())
985 ->devToolsAgentImpl(); 987 ->devToolsAgentImpl();
986 } 988 }
987 989
988 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { 990 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) {
989 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); 991 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url));
990 } 992 }
991 993
992 } // namespace blink 994 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/FrameLoaderClientImpl.h ('k') | third_party/WebKit/Source/web/WebDataSourceImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698