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

Side by Side Diff: content/browser/frame_host/navigator_impl.cc

Issue 2682193002: Convert NavigationController unit and browser tests to use the new navigation callbacks. (Closed)
Patch Set: Created 3 years, 10 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
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 #include "content/browser/frame_host/navigator_impl.h" 5 #include "content/browser/frame_host/navigator_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/metrics/histogram_macros.h" 10 #include "base/metrics/histogram_macros.h"
(...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after
667 ui::PAGE_TRANSITION_FORWARD_BACK)) { 667 ui::PAGE_TRANSITION_FORWARD_BACK)) {
668 transition_type = ui::PageTransitionFromInt( 668 transition_type = ui::PageTransitionFromInt(
669 params.transition | ui::PAGE_TRANSITION_FORWARD_BACK); 669 params.transition | ui::PAGE_TRANSITION_FORWARD_BACK);
670 } 670 }
671 671
672 delegate_->DidCommitProvisionalLoad(render_frame_host, 672 delegate_->DidCommitProvisionalLoad(render_frame_host,
673 params.url, 673 params.url,
674 transition_type); 674 transition_type);
675 navigation_handle->DidCommitNavigation(params, details.did_replace_entry, 675 navigation_handle->DidCommitNavigation(params, details.did_replace_entry,
676 details.previous_url, 676 details.previous_url,
677 details.type,
677 render_frame_host); 678 render_frame_host);
678 navigation_handle.reset(); 679 navigation_handle.reset();
679 } 680 }
680 681
681 if (!did_navigate) 682 if (!did_navigate)
682 return; // No navigation happened. 683 return; // No navigation happened.
683 684
684 // DO NOT ADD MORE STUFF TO THIS FUNCTION! Your component should either listen 685 // DO NOT ADD MORE STUFF TO THIS FUNCTION! Your component should either listen
685 // for the appropriate notification (best) or you can add it to 686 // for the appropriate notification (best) or you can add it to
686 // DidNavigateMainFramePostCommit / DidNavigateAnyFramePostCommit (only if 687 // DidNavigateMainFramePostCommit / DidNavigateAnyFramePostCommit (only if
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
1280 if (navigation_handle) 1281 if (navigation_handle)
1281 navigation_handle->update_entry_id_for_transfer(entry->GetUniqueID()); 1282 navigation_handle->update_entry_id_for_transfer(entry->GetUniqueID());
1282 1283
1283 controller_->SetPendingEntry(std::move(entry)); 1284 controller_->SetPendingEntry(std::move(entry));
1284 if (delegate_) 1285 if (delegate_)
1285 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); 1286 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL);
1286 } 1287 }
1287 } 1288 }
1288 1289
1289 } // namespace content 1290 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698