OLD | NEW |
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 840 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
851 GURL GetLoadingUrl() const; | 851 GURL GetLoadingUrl() const; |
852 | 852 |
853 // If we initiated a navigation, this function will populate |document_state| | 853 // If we initiated a navigation, this function will populate |document_state| |
854 // with the navigation information saved in OnNavigate(). | 854 // with the navigation information saved in OnNavigate(). |
855 void PopulateDocumentStateFromPending(DocumentState* document_state); | 855 void PopulateDocumentStateFromPending(DocumentState* document_state); |
856 | 856 |
857 // Returns a new NavigationState populated with the navigation information | 857 // Returns a new NavigationState populated with the navigation information |
858 // saved in OnNavigate(). | 858 // saved in OnNavigate(). |
859 NavigationState* CreateNavigationStateFromPending(); | 859 NavigationState* CreateNavigationStateFromPending(); |
860 | 860 |
| 861 // Updates the DocumentState's navigation_state using either the pending |
| 862 // navigation state or a newly constructed one. Called from |
| 863 // didCreateDataSource and didNavigateWithinPage. |
| 864 void UpdateNavigationState(DocumentState* document_state); |
| 865 |
861 #if defined(OS_ANDROID) | 866 #if defined(OS_ANDROID) |
862 blink::WebMediaPlayer* CreateAndroidWebMediaPlayer( | 867 blink::WebMediaPlayer* CreateAndroidWebMediaPlayer( |
863 blink::WebMediaPlayerClient* client, | 868 blink::WebMediaPlayerClient* client, |
864 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, | 869 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, |
865 const media::WebMediaPlayerParams& params); | 870 const media::WebMediaPlayerParams& params); |
866 | 871 |
867 RendererMediaPlayerManager* GetMediaPlayerManager(); | 872 RendererMediaPlayerManager* GetMediaPlayerManager(); |
868 #endif | 873 #endif |
869 | 874 |
870 bool AreSecureCodecsSupported(); | 875 bool AreSecureCodecsSupported(); |
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1083 #endif | 1088 #endif |
1084 | 1089 |
1085 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; | 1090 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; |
1086 | 1091 |
1087 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); | 1092 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); |
1088 }; | 1093 }; |
1089 | 1094 |
1090 } // namespace content | 1095 } // namespace content |
1091 | 1096 |
1092 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 1097 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
OLD | NEW |