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

Unified Diff: android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.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 | « no previous file | android_webview/java/src/org/chromium/android_webview/AwContents.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
diff --git a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
index 62a4d0719eaa709e9a0c3326c27a742216a723c7..56d06e19efd9311414a1ea137ab33e51ff33dbac 100644
--- a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
+++ b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
@@ -406,13 +406,13 @@ void AwResourceDispatcherHostDelegate::AddExtraHeadersIfNeeded(
if (request_info->GetResourceType() != content::RESOURCE_TYPE_MAIN_FRAME)
return;
- const content::PageTransition transition = request_info->GetPageTransition();
+ const ui::PageTransition transition = request_info->GetPageTransition();
const bool is_load_url =
- transition & content::PAGE_TRANSITION_FROM_API;
+ transition & ui::PAGE_TRANSITION_FROM_API;
const bool is_go_back_forward =
- transition & content::PAGE_TRANSITION_FORWARD_BACK;
- const bool is_reload = content::PageTransitionCoreTypeIs(
- transition, content::PAGE_TRANSITION_RELOAD);
+ transition & ui::PAGE_TRANSITION_FORWARD_BACK;
+ const bool is_reload = ui::PageTransitionCoreTypeIs(
+ transition, ui::PAGE_TRANSITION_RELOAD);
if (is_load_url || is_go_back_forward || is_reload) {
AwResourceContext* awrc = static_cast<AwResourceContext*>(resource_context);
std::string extra_headers = awrc->GetExtraHeaders(request->url());
« no previous file with comments | « no previous file | android_webview/java/src/org/chromium/android_webview/AwContents.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698