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

Side by Side Diff: content/renderer/render_frame_impl.h

Issue 1304373007: Browser test for LoadDataWithBaseURL reload (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reverts Created 5 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 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 15 matching lines...) Expand all
26 #include "content/renderer/renderer_webcookiejar_impl.h" 26 #include "content/renderer/renderer_webcookiejar_impl.h"
27 #include "ipc/ipc_message.h" 27 #include "ipc/ipc_message.h"
28 #include "media/blink/webmediaplayer_delegate.h" 28 #include "media/blink/webmediaplayer_delegate.h"
29 #include "media/blink/webmediaplayer_params.h" 29 #include "media/blink/webmediaplayer_params.h"
30 #include "mojo/application/public/interfaces/service_provider.mojom.h" 30 #include "mojo/application/public/interfaces/service_provider.mojom.h"
31 #include "mojo/application/public/interfaces/shell.mojom.h" 31 #include "mojo/application/public/interfaces/shell.mojom.h"
32 #include "third_party/WebKit/public/platform/modules/app_banner/WebAppBannerClie nt.h" 32 #include "third_party/WebKit/public/platform/modules/app_banner/WebAppBannerClie nt.h"
33 #include "third_party/WebKit/public/web/WebAXObject.h" 33 #include "third_party/WebKit/public/web/WebAXObject.h"
34 #include "third_party/WebKit/public/web/WebDataSource.h" 34 #include "third_party/WebKit/public/web/WebDataSource.h"
35 #include "third_party/WebKit/public/web/WebFrameClient.h" 35 #include "third_party/WebKit/public/web/WebFrameClient.h"
36 #include "third_party/WebKit/public/web/WebFrameLoadType.h"
36 #include "third_party/WebKit/public/web/WebFrameOwnerProperties.h" 37 #include "third_party/WebKit/public/web/WebFrameOwnerProperties.h"
37 #include "third_party/WebKit/public/web/WebHistoryCommitType.h" 38 #include "third_party/WebKit/public/web/WebHistoryCommitType.h"
38 #include "third_party/WebKit/public/web/WebMeaningfulLayout.h" 39 #include "third_party/WebKit/public/web/WebMeaningfulLayout.h"
39 #include "third_party/WebKit/public/web/WebPageSerializerClient.h" 40 #include "third_party/WebKit/public/web/WebPageSerializerClient.h"
40 #include "third_party/WebKit/public/web/WebScriptExecutionCallback.h" 41 #include "third_party/WebKit/public/web/WebScriptExecutionCallback.h"
41 #include "ui/gfx/range/range.h" 42 #include "ui/gfx/range/range.h"
42 43
43 #if defined(ENABLE_PLUGINS) 44 #if defined(ENABLE_PLUGINS)
44 #include "content/renderer/pepper/plugin_power_saver_helper.h" 45 #include "content/renderer/pepper/plugin_power_saver_helper.h"
45 #endif 46 #endif
(...skipping 787 matching lines...) Expand 10 before | Expand all | Expand 10 after
833 bool* is_reload, 834 bool* is_reload,
834 blink::WebURLRequest::CachePolicy* cache_policy); 835 blink::WebURLRequest::CachePolicy* cache_policy);
835 836
836 // PlzNavigate 837 // PlzNavigate
837 // Sends a FrameHostMsg_BeginNavigation to the browser based on the contents 838 // Sends a FrameHostMsg_BeginNavigation to the browser based on the contents
838 // of the WebURLRequest. 839 // of the WebURLRequest.
839 void BeginNavigation(blink::WebURLRequest* request); 840 void BeginNavigation(blink::WebURLRequest* request);
840 841
841 // Loads a data url. 842 // Loads a data url.
842 void LoadDataURL(const CommonNavigationParams& params, 843 void LoadDataURL(const CommonNavigationParams& params,
843 blink::WebFrame* frame); 844 blink::WebFrame* frame,
845 blink::WebFrameLoadType load_type);
844 846
845 // Sends the current frame's navigation state to the browser. 847 // Sends the current frame's navigation state to the browser.
846 void SendUpdateState(); 848 void SendUpdateState();
847 849
848 // Sends a proper FrameHostMsg_DidFailProvisionalLoadWithError_Params IPC for 850 // Sends a proper FrameHostMsg_DidFailProvisionalLoadWithError_Params IPC for
849 // the failed request |request|. 851 // the failed request |request|.
850 void SendFailedProvisionalLoad(const blink::WebURLRequest& request, 852 void SendFailedProvisionalLoad(const blink::WebURLRequest& request,
851 const blink::WebURLError& error, 853 const blink::WebURLError& error,
852 blink::WebLocalFrame* frame); 854 blink::WebLocalFrame* frame);
853 855
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
1101 #endif 1103 #endif
1102 1104
1103 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1105 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1104 1106
1105 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1107 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1106 }; 1108 };
1107 1109
1108 } // namespace content 1110 } // namespace content
1109 1111
1110 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1112 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698