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

Unified Diff: android_webview/native/permission/permission_request_handler.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
« no previous file with comments | « android_webview/libwebviewchromium.gypi ('k') | apps/custom_launcher_page_contents.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/native/permission/permission_request_handler.cc
diff --git a/android_webview/native/permission/permission_request_handler.cc b/android_webview/native/permission/permission_request_handler.cc
index bb6cce3f04d71c02a0fe301016ba7b90c7cb23a4..45d1f2d9e98aed8430b6b2ccd9cb7ff6f749a94e 100644
--- a/android_webview/native/permission/permission_request_handler.cc
+++ b/android_webview/native/permission/permission_request_handler.cc
@@ -82,10 +82,10 @@ void PermissionRequestHandler::PreauthorizePermission(const GURL& origin,
void PermissionRequestHandler::NavigationEntryCommitted(
const content::LoadCommittedDetails& details) {
- const content::PageTransition transition = details.entry->GetTransitionType();
+ const ui::PageTransition transition = details.entry->GetTransitionType();
if (details.is_navigation_to_different_page() ||
- content::PageTransitionStripQualifier(transition) ==
- content::PAGE_TRANSITION_RELOAD ||
+ ui::PageTransitionStripQualifier(transition) ==
+ ui::PAGE_TRANSITION_RELOAD ||
contents_unique_id_ != details.entry->GetUniqueID()) {
CancelAllRequests();
contents_unique_id_ = details.entry->GetUniqueID();
« no previous file with comments | « android_webview/libwebviewchromium.gypi ('k') | apps/custom_launcher_page_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698