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 // Sets the NavigationState on the DocumentState based on | |
862 // the value of |pending_navigation_params_|. | |
863 void UpdateNavigationState(DocumentState* document_state); | |
864 | |
865 #if defined(OS_ANDROID) | 861 #if defined(OS_ANDROID) |
866 blink::WebMediaPlayer* CreateAndroidWebMediaPlayer( | 862 blink::WebMediaPlayer* CreateAndroidWebMediaPlayer( |
867 blink::WebMediaPlayerClient* client, | 863 blink::WebMediaPlayerClient* client, |
868 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, | 864 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, |
869 const media::WebMediaPlayerParams& params); | 865 const media::WebMediaPlayerParams& params); |
870 | 866 |
871 RendererMediaPlayerManager* GetMediaPlayerManager(); | 867 RendererMediaPlayerManager* GetMediaPlayerManager(); |
872 #endif | 868 #endif |
873 | 869 |
874 bool AreSecureCodecsSupported(); | 870 bool AreSecureCodecsSupported(); |
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1087 #endif | 1083 #endif |
1088 | 1084 |
1089 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; | 1085 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; |
1090 | 1086 |
1091 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); | 1087 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); |
1092 }; | 1088 }; |
1093 | 1089 |
1094 } // namespace content | 1090 } // namespace content |
1095 | 1091 |
1096 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 1092 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
OLD | NEW |