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

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

Issue 1423453007: Let RenderFrameImpl set navigationStart based on CommonNavigationParams (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@navigation_start_common_params
Patch Set: Comments and whitespace (trybots previous) 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 840 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
861 #if defined(OS_ANDROID) 865 #if defined(OS_ANDROID)
862 blink::WebMediaPlayer* CreateAndroidWebMediaPlayer( 866 blink::WebMediaPlayer* CreateAndroidWebMediaPlayer(
863 blink::WebMediaPlayerClient* client, 867 blink::WebMediaPlayerClient* client,
864 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, 868 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
865 const media::WebMediaPlayerParams& params); 869 const media::WebMediaPlayerParams& params);
866 870
867 RendererMediaPlayerManager* GetMediaPlayerManager(); 871 RendererMediaPlayerManager* GetMediaPlayerManager();
868 #endif 872 #endif
869 873
870 bool AreSecureCodecsSupported(); 874 bool AreSecureCodecsSupported();
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
1083 #endif 1087 #endif
1084 1088
1085 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1089 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1086 1090
1087 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1091 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1088 }; 1092 };
1089 1093
1090 } // namespace content 1094 } // namespace content
1091 1095
1092 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1096 #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