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

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

Issue 1976573002: Only use pending navigation params for browser-initiated navigations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: consistency Created 4 years, 7 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
« no previous file with comments | « content/public/test/render_view_test.cc ('k') | 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 <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 void didFinishDocumentLoad(blink::WebLocalFrame* frame) override; 514 void didFinishDocumentLoad(blink::WebLocalFrame* frame) override;
515 void runScriptsAtDocumentReady(blink::WebLocalFrame* frame, 515 void runScriptsAtDocumentReady(blink::WebLocalFrame* frame,
516 bool document_is_empty) override; 516 bool document_is_empty) override;
517 void didHandleOnloadEvents(blink::WebLocalFrame* frame) override; 517 void didHandleOnloadEvents(blink::WebLocalFrame* frame) override;
518 void didFailLoad(blink::WebLocalFrame* frame, 518 void didFailLoad(blink::WebLocalFrame* frame,
519 const blink::WebURLError& error, 519 const blink::WebURLError& error,
520 blink::WebHistoryCommitType commit_type) override; 520 blink::WebHistoryCommitType commit_type) override;
521 void didFinishLoad(blink::WebLocalFrame* frame) override; 521 void didFinishLoad(blink::WebLocalFrame* frame) override;
522 void didNavigateWithinPage(blink::WebLocalFrame* frame, 522 void didNavigateWithinPage(blink::WebLocalFrame* frame,
523 const blink::WebHistoryItem& item, 523 const blink::WebHistoryItem& item,
524 blink::WebHistoryCommitType commit_type) override; 524 blink::WebHistoryCommitType commit_type,
525 bool content_initiated) override;
525 void didUpdateCurrentHistoryItem() override; 526 void didUpdateCurrentHistoryItem() override;
526 void didChangeThemeColor() override; 527 void didChangeThemeColor() override;
527 void dispatchLoad() override; 528 void dispatchLoad() override;
528 blink::WebEffectiveConnectionType getEffectiveConnectionType() override; 529 blink::WebEffectiveConnectionType getEffectiveConnectionType() override;
529 void requestNotificationPermission( 530 void requestNotificationPermission(
530 const blink::WebSecurityOrigin& origin, 531 const blink::WebSecurityOrigin& origin,
531 blink::WebNotificationPermissionCallback* callback) override; 532 blink::WebNotificationPermissionCallback* callback) override;
532 void didChangeSelection(bool is_empty_selection) override; 533 void didChangeSelection(bool is_empty_selection) override;
533 blink::WebColorChooser* createColorChooser( 534 blink::WebColorChooser* createColorChooser(
534 blink::WebColorChooserClient* client, 535 blink::WebColorChooserClient* client,
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
958 // with the navigation information saved in OnNavigate(). 959 // with the navigation information saved in OnNavigate().
959 void PopulateDocumentStateFromPending(DocumentState* document_state); 960 void PopulateDocumentStateFromPending(DocumentState* document_state);
960 961
961 // Returns a new NavigationState populated with the navigation information 962 // Returns a new NavigationState populated with the navigation information
962 // saved in OnNavigate(). 963 // saved in OnNavigate().
963 NavigationState* CreateNavigationStateFromPending(); 964 NavigationState* CreateNavigationStateFromPending();
964 965
965 // Sets the NavigationState on the DocumentState based on 966 // Sets the NavigationState on the DocumentState based on
966 // the value of |pending_navigation_params_|. 967 // the value of |pending_navigation_params_|.
967 void UpdateNavigationState(DocumentState* document_state, 968 void UpdateNavigationState(DocumentState* document_state,
968 bool was_within_same_page); 969 bool was_within_same_page,
970 bool content_initiated);
969 971
970 #if defined(OS_ANDROID) 972 #if defined(OS_ANDROID)
971 blink::WebMediaPlayer* CreateAndroidWebMediaPlayer( 973 blink::WebMediaPlayer* CreateAndroidWebMediaPlayer(
972 blink::WebMediaPlayerClient* client, 974 blink::WebMediaPlayerClient* client,
973 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, 975 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
974 const media::WebMediaPlayerParams& params); 976 const media::WebMediaPlayerParams& params);
975 977
976 RendererMediaPlayerManager* GetMediaPlayerManager(); 978 RendererMediaPlayerManager* GetMediaPlayerManager();
977 979
978 RendererMediaSessionManager* GetMediaSessionManager(); 980 RendererMediaSessionManager* GetMediaSessionManager();
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
1255 #endif 1257 #endif
1256 1258
1257 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1259 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1258 1260
1259 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1261 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1260 }; 1262 };
1261 1263
1262 } // namespace content 1264 } // namespace content
1263 1265
1264 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1266 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW
« no previous file with comments | « content/public/test/render_view_test.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698