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

Unified Diff: chrome/browser/extensions/api/web_navigation/web_navigation_api.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: chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
index ec17b8af7e4d8dbd56806e59003884b871f42a63..24a4de3c93a4c3223416afaa956faa0d3b49c8ef 100644
--- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
+++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
@@ -367,7 +367,7 @@ void WebNavigationTabObserver::DidStartProvisionalLoadForFrame(
void WebNavigationTabObserver::DidCommitProvisionalLoadForFrame(
content::RenderFrameHost* render_frame_host,
const GURL& url,
- content::PageTransition transition_type) {
+ ui::PageTransition transition_type) {
content::RenderViewHost* render_view_host =
render_frame_host->GetRenderViewHost();
DVLOG(2) << "DidCommitProvisionalLoad("
@@ -423,8 +423,8 @@ void WebNavigationTabObserver::DidCommitProvisionalLoadForFrame(
transition_type);
} else {
if (navigation_state_.GetIsServerRedirected(render_frame_host)) {
- transition_type = static_cast<content::PageTransition>(
- transition_type | content::PAGE_TRANSITION_SERVER_REDIRECT);
+ transition_type = ui::PageTransitionFromInt(
+ transition_type | ui::PAGE_TRANSITION_SERVER_REDIRECT);
}
helpers::DispatchOnCommitted(web_navigation::OnCommitted::kEventName,
web_contents(),
@@ -575,7 +575,7 @@ void WebNavigationTabObserver::DidOpenRequestedURL(
const GURL& url,
const content::Referrer& referrer,
WindowOpenDisposition disposition,
- content::PageTransition transition,
+ ui::PageTransition transition,
int64 source_frame_num) {
content::RenderFrameHost* render_frame_host =
content::RenderFrameHost::FromID(render_view_host_->GetProcess()->GetID(),

Powered by Google App Engine
This is Rietveld 408576698