| Index: content/browser/renderer_host/render_view_host.cc
|
| ===================================================================
|
| --- content/browser/renderer_host/render_view_host.cc (revision 105162)
|
| +++ content/browser/renderer_host/render_view_host.cc (working copy)
|
| @@ -257,7 +257,7 @@
|
| params.current_history_list_offset = -1;
|
| params.current_history_list_length = 0;
|
| params.url = url;
|
| - params.transition = PageTransition::LINK;
|
| + params.transition = content::PAGE_TRANSITION_LINK;
|
| params.navigation_type = ViewMsg_Navigate_Type::NORMAL;
|
| Navigate(params);
|
| }
|
| @@ -815,7 +815,7 @@
|
| // to allow the pending navigation to continue.
|
| if (is_waiting_for_beforeunload_ack_ &&
|
| unload_ack_is_for_cross_site_transition_ &&
|
| - PageTransition::IsMainFrame(validated_params.transition)) {
|
| + content::PageTransitionIsMainFrame(validated_params.transition)) {
|
| OnMsgShouldCloseACK(true);
|
| return;
|
| }
|
|
|