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

Unified Diff: content/browser/frame_host/render_frame_host_manager.cc

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/render_frame_host_manager.cc
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index b97c76bc50e2f4dab3a65b55e0ec77ee8eafc6d2..52bd32f37601dc2185bb795d53305a4cc93df6cd 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -358,7 +358,7 @@ void RenderFrameHostManager::OnCrossSiteResponse(
scoped_ptr<CrossSiteTransferringRequest> cross_site_transferring_request,
const std::vector<GURL>& transfer_url_chain,
const Referrer& referrer,
- PageTransition page_transition,
+ ui::PageTransition page_transition,
bool should_replace_current_entry) {
// We should only get here for transfer navigations. Most cross-process
// navigations can just continue and wait to run the unload handler (by
@@ -802,7 +802,7 @@ bool RenderFrameHostManager::ShouldReuseWebUI(
SiteInstance* RenderFrameHostManager::GetSiteInstanceForNavigation(
const GURL& dest_url,
SiteInstance* dest_instance,
- PageTransition dest_transition,
+ ui::PageTransition dest_transition,
bool dest_is_restore,
bool dest_is_view_source_mode) {
SiteInstance* current_instance = render_frame_host_->GetSiteInstance();
@@ -856,7 +856,7 @@ SiteInstance* RenderFrameHostManager::GetSiteInstanceForNavigation(
SiteInstance* RenderFrameHostManager::GetSiteInstanceForURL(
const GURL& dest_url,
SiteInstance* dest_instance,
- PageTransition dest_transition,
+ ui::PageTransition dest_transition,
bool dest_is_restore,
bool dest_is_view_source_mode,
SiteInstance* current_instance,
@@ -891,7 +891,8 @@ SiteInstance* RenderFrameHostManager::GetSiteInstanceForURL(
// RenderViews in response to a link click.
//
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kProcessPerSite) &&
- PageTransitionCoreTypeIs(dest_transition, PAGE_TRANSITION_GENERATED)) {
+ ui::PageTransitionCoreTypeIs(
+ dest_transition, ui::PAGE_TRANSITION_GENERATED)) {
return current_instance;
}

Powered by Google App Engine
This is Rietveld 408576698