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

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

Issue 1425303002: OOPIF: Stop using HistoryController and refactor UpdateState. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix nit 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 <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 829 matching lines...) Expand 10 before | Expand all | Expand 10 after
840 840
841 // PlzNavigate 841 // PlzNavigate
842 // Sends a FrameHostMsg_BeginNavigation to the browser based on the contents 842 // Sends a FrameHostMsg_BeginNavigation to the browser based on the contents
843 // of the WebURLRequest. 843 // of the WebURLRequest.
844 void BeginNavigation(blink::WebURLRequest* request); 844 void BeginNavigation(blink::WebURLRequest* request);
845 845
846 // Loads a data url. 846 // Loads a data url.
847 void LoadDataURL(const CommonNavigationParams& params, 847 void LoadDataURL(const CommonNavigationParams& params,
848 blink::WebFrame* frame); 848 blink::WebFrame* frame);
849 849
850 // Sends the current frame's navigation state to the browser.
851 void SendUpdateState();
852
850 // Sends a proper FrameHostMsg_DidFailProvisionalLoadWithError_Params IPC for 853 // Sends a proper FrameHostMsg_DidFailProvisionalLoadWithError_Params IPC for
851 // the failed request |request|. 854 // the failed request |request|.
852 void SendFailedProvisionalLoad(const blink::WebURLRequest& request, 855 void SendFailedProvisionalLoad(const blink::WebURLRequest& request,
853 const blink::WebURLError& error, 856 const blink::WebURLError& error,
854 blink::WebLocalFrame* frame); 857 blink::WebLocalFrame* frame);
855 858
856 bool ShouldDisplayErrorPageForFailedLoad(int error_code, 859 bool ShouldDisplayErrorPageForFailedLoad(int error_code,
857 const GURL& unreachable_url); 860 const GURL& unreachable_url);
858 861
859 // Returns the URL being loaded by the |frame_|'s request. 862 // Returns the URL being loaded by the |frame_|'s request.
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
931 // frame, but eventually this will also apply to top-level frames. 934 // frame, but eventually this will also apply to top-level frames.
932 // TODO(kenrb): Correct the above statement when top-level frames have their 935 // TODO(kenrb): Correct the above statement when top-level frames have their
933 // own RenderWidgets. 936 // own RenderWidgets.
934 scoped_refptr<RenderWidget> render_widget_; 937 scoped_refptr<RenderWidget> render_widget_;
935 938
936 // Temporarily holds state pertaining to a navigation that has been initiated 939 // Temporarily holds state pertaining to a navigation that has been initiated
937 // until the NavigationState corresponding to the new navigation is created in 940 // until the NavigationState corresponding to the new navigation is created in
938 // didCreateDataSource(). 941 // didCreateDataSource().
939 scoped_ptr<NavigationParams> pending_navigation_params_; 942 scoped_ptr<NavigationParams> pending_navigation_params_;
940 943
944 // Stores the current history item for this frame, so that updates to it can
945 // be reported to the browser process via SendUpdateState.
946 blink::WebHistoryItem current_history_item_;
947
941 #if defined(ENABLE_PLUGINS) 948 #if defined(ENABLE_PLUGINS)
942 // Current text input composition text. Empty if no composition is in 949 // Current text input composition text. Empty if no composition is in
943 // progress. 950 // progress.
944 base::string16 pepper_composition_text_; 951 base::string16 pepper_composition_text_;
945 952
946 PluginPowerSaverHelper* plugin_power_saver_helper_; 953 PluginPowerSaverHelper* plugin_power_saver_helper_;
947 #endif 954 #endif
948 955
949 RendererWebCookieJarImpl cookie_jar_; 956 RendererWebCookieJarImpl cookie_jar_;
950 957
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
1092 #endif 1099 #endif
1093 1100
1094 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1101 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1095 1102
1096 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1103 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1097 }; 1104 };
1098 1105
1099 } // namespace content 1106 } // namespace content
1100 1107
1101 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1108 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/history_controller_browsertest.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698