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

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

Issue 1802383004: Fix in-page navigation after LoadDataWithBaseURL (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test for LoadDataAsStringWithBaseURL on android Created 4 years, 9 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
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 <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 914 matching lines...) Expand 10 before | Expand all | Expand 10 after
925 // If we initiated a navigation, this function will populate |document_state| 925 // If we initiated a navigation, this function will populate |document_state|
926 // with the navigation information saved in OnNavigate(). 926 // with the navigation information saved in OnNavigate().
927 void PopulateDocumentStateFromPending(DocumentState* document_state); 927 void PopulateDocumentStateFromPending(DocumentState* document_state);
928 928
929 // Returns a new NavigationState populated with the navigation information 929 // Returns a new NavigationState populated with the navigation information
930 // saved in OnNavigate(). 930 // saved in OnNavigate().
931 NavigationState* CreateNavigationStateFromPending(); 931 NavigationState* CreateNavigationStateFromPending();
932 932
933 // Sets the NavigationState on the DocumentState based on 933 // Sets the NavigationState on the DocumentState based on
934 // the value of |pending_navigation_params_|. 934 // the value of |pending_navigation_params_|.
935 void UpdateNavigationState(DocumentState* document_state); 935 void UpdateNavigationState(DocumentState* document_state,
936 bool was_within_same_page);
936 937
937 #if defined(OS_ANDROID) 938 #if defined(OS_ANDROID)
938 blink::WebMediaPlayer* CreateAndroidWebMediaPlayer( 939 blink::WebMediaPlayer* CreateAndroidWebMediaPlayer(
939 blink::WebMediaPlayerClient* client, 940 blink::WebMediaPlayerClient* client,
940 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, 941 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
941 const media::WebMediaPlayerParams& params); 942 const media::WebMediaPlayerParams& params);
942 943
943 RendererMediaPlayerManager* GetMediaPlayerManager(); 944 RendererMediaPlayerManager* GetMediaPlayerManager();
944 945
945 RendererMediaSessionManager* GetMediaSessionManager(); 946 RendererMediaSessionManager* GetMediaSessionManager();
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
1208 #endif 1209 #endif
1209 1210
1210 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1211 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1211 1212
1212 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1213 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1213 }; 1214 };
1214 1215
1215 } // namespace content 1216 } // namespace content
1216 1217
1217 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1218 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/frame_host/navigation_controller_impl_browsertest.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698