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

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

Issue 1409883008: (Reland) set navigationStart based on CommonNavigationParams (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « no previous file | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 852 matching lines...) Expand 10 before | Expand all | Expand 10 after
863 GURL GetLoadingUrl() const; 863 GURL GetLoadingUrl() const;
864 864
865 // If we initiated a navigation, this function will populate |document_state| 865 // If we initiated a navigation, this function will populate |document_state|
866 // with the navigation information saved in OnNavigate(). 866 // with the navigation information saved in OnNavigate().
867 void PopulateDocumentStateFromPending(DocumentState* document_state); 867 void PopulateDocumentStateFromPending(DocumentState* document_state);
868 868
869 // Returns a new NavigationState populated with the navigation information 869 // Returns a new NavigationState populated with the navigation information
870 // saved in OnNavigate(). 870 // saved in OnNavigate().
871 NavigationState* CreateNavigationStateFromPending(); 871 NavigationState* CreateNavigationStateFromPending();
872 872
873 // Sets the NavigationState on the DocumentState based on
874 // the value of |pending_navigation_params_|.
875 void UpdateNavigationState(DocumentState* document_state);
876
873 #if defined(OS_ANDROID) 877 #if defined(OS_ANDROID)
874 blink::WebMediaPlayer* CreateAndroidWebMediaPlayer( 878 blink::WebMediaPlayer* CreateAndroidWebMediaPlayer(
875 blink::WebMediaPlayerClient* client, 879 blink::WebMediaPlayerClient* client,
876 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, 880 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
877 const media::WebMediaPlayerParams& params); 881 const media::WebMediaPlayerParams& params);
878 882
879 RendererMediaPlayerManager* GetMediaPlayerManager(); 883 RendererMediaPlayerManager* GetMediaPlayerManager();
880 #endif 884 #endif
881 885
882 bool AreSecureCodecsSupported(); 886 bool AreSecureCodecsSupported();
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
1093 #endif 1097 #endif
1094 1098
1095 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1099 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1096 1100
1097 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1101 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1098 }; 1102 };
1099 1103
1100 } // namespace content 1104 } // namespace content
1101 1105
1102 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1106 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698