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

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

Issue 358973005: Navigation transitions: Pass is_transition_navigation flag up to the embedder (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
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 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message, 262 virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message,
263 const blink::WebString& source_name, 263 const blink::WebString& source_name,
264 unsigned source_line, 264 unsigned source_line,
265 const blink::WebString& stack_trace); 265 const blink::WebString& stack_trace);
266 virtual void loadURLExternally(blink::WebLocalFrame* frame, 266 virtual void loadURLExternally(blink::WebLocalFrame* frame,
267 const blink::WebURLRequest& request, 267 const blink::WebURLRequest& request,
268 blink::WebNavigationPolicy policy, 268 blink::WebNavigationPolicy policy,
269 const blink::WebString& suggested_name); 269 const blink::WebString& suggested_name);
270 // The WebDataSource::ExtraData* is assumed to be a DocumentState* subclass. 270 // The WebDataSource::ExtraData* is assumed to be a DocumentState* subclass.
271 virtual blink::WebNavigationPolicy decidePolicyForNavigation( 271 virtual blink::WebNavigationPolicy decidePolicyForNavigation(
272 blink::WebLocalFrame* frame, 272 const NavigationPolicyInfo& info);
273 blink::WebDataSource::ExtraData* extra_data,
274 const blink::WebURLRequest& request,
275 blink::WebNavigationType type,
276 blink::WebNavigationPolicy default_policy,
277 bool is_redirect);
278 virtual blink::WebHistoryItem historyItemForNewChildFrame( 273 virtual blink::WebHistoryItem historyItemForNewChildFrame(
279 blink::WebFrame* frame); 274 blink::WebFrame* frame);
280 virtual void willSendSubmitEvent(blink::WebLocalFrame* frame, 275 virtual void willSendSubmitEvent(blink::WebLocalFrame* frame,
281 const blink::WebFormElement& form); 276 const blink::WebFormElement& form);
282 virtual void willSubmitForm(blink::WebLocalFrame* frame, 277 virtual void willSubmitForm(blink::WebLocalFrame* frame,
283 const blink::WebFormElement& form); 278 const blink::WebFormElement& form);
284 virtual void didCreateDataSource(blink::WebLocalFrame* frame, 279 virtual void didCreateDataSource(blink::WebLocalFrame* frame,
285 blink::WebDataSource* datasource); 280 blink::WebDataSource* datasource);
286 virtual void didStartProvisionalLoad(blink::WebLocalFrame* frame); 281 virtual void didStartProvisionalLoad(blink::WebLocalFrame* frame,
282 bool is_transition_navigation);
287 virtual void didReceiveServerRedirectForProvisionalLoad( 283 virtual void didReceiveServerRedirectForProvisionalLoad(
288 blink::WebLocalFrame* frame); 284 blink::WebLocalFrame* frame);
289 virtual void didFailProvisionalLoad( 285 virtual void didFailProvisionalLoad(
290 blink::WebLocalFrame* frame, 286 blink::WebLocalFrame* frame,
291 const blink::WebURLError& error); 287 const blink::WebURLError& error);
292 virtual void didCommitProvisionalLoad( 288 virtual void didCommitProvisionalLoad(
293 blink::WebLocalFrame* frame, 289 blink::WebLocalFrame* frame,
294 const blink::WebHistoryItem& item, 290 const blink::WebHistoryItem& item,
295 blink::WebHistoryCommitType commit_type); 291 blink::WebHistoryCommitType commit_type);
296 virtual void didClearWindowObject(blink::WebLocalFrame* frame); 292 virtual void didClearWindowObject(blink::WebLocalFrame* frame);
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 #endif 467 #endif
472 468
473 // Virtual since overridden by WebTestProxy for layout tests. 469 // Virtual since overridden by WebTestProxy for layout tests.
474 virtual blink::WebNavigationPolicy DecidePolicyForNavigation( 470 virtual blink::WebNavigationPolicy DecidePolicyForNavigation(
475 RenderFrame* render_frame, 471 RenderFrame* render_frame,
476 blink::WebFrame* frame, 472 blink::WebFrame* frame,
477 blink::WebDataSource::ExtraData* extraData, 473 blink::WebDataSource::ExtraData* extraData,
478 const blink::WebURLRequest& request, 474 const blink::WebURLRequest& request,
479 blink::WebNavigationType type, 475 blink::WebNavigationType type,
480 blink::WebNavigationPolicy default_policy, 476 blink::WebNavigationPolicy default_policy,
481 bool is_redirect); 477 bool is_redirect,
478 bool is_transition_navigation);
nasko 2014/07/03 09:39:31 Why not collapse all of these also to a Navigation
oystein (OOO til 10th of July) 2014/07/22 00:02:43 Done.
482 void OpenURL(blink::WebFrame* frame, 479 void OpenURL(blink::WebFrame* frame,
483 const GURL& url, 480 const GURL& url,
484 const Referrer& referrer, 481 const Referrer& referrer,
485 blink::WebNavigationPolicy policy); 482 blink::WebNavigationPolicy policy,
483 bool is_transition_navigation);
486 484
487 // Update current main frame's encoding and send it to browser window. 485 // Update current main frame's encoding and send it to browser window.
488 // Since we want to let users see the right encoding info from menu 486 // Since we want to let users see the right encoding info from menu
489 // before finishing loading, we call the UpdateEncoding in 487 // before finishing loading, we call the UpdateEncoding in
490 // a) function:DidCommitLoadForFrame. When this function is called, 488 // a) function:DidCommitLoadForFrame. When this function is called,
491 // that means we have got first data. In here we try to get encoding 489 // that means we have got first data. In here we try to get encoding
492 // of page if it has been specified in http header. 490 // of page if it has been specified in http header.
493 // b) function:DidReceiveTitle. When this function is called, 491 // b) function:DidReceiveTitle. When this function is called,
494 // that means we have got specified title. Because in most of webpages, 492 // that means we have got specified title. Because in most of webpages,
495 // title tags will follow meta tags. In here we try to get encoding of 493 // title tags will follow meta tags. In here we try to get encoding of
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 ScreenOrientationDispatcher* screen_orientation_dispatcher_; 642 ScreenOrientationDispatcher* screen_orientation_dispatcher_;
645 643
646 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 644 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
647 645
648 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 646 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
649 }; 647 };
650 648
651 } // namespace content 649 } // namespace content
652 650
653 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 651 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698