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

Unified Diff: content/browser/android/web_contents_observer_proxy.cc

Issue 2716493004: Renamed NavigationHandle::IsSamePage to NavigationHandle::IsSameDocument (Closed)
Patch Set: Rebased Created 3 years, 9 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 | « components/zoom/zoom_controller.cc ('k') | content/browser/bluetooth/web_bluetooth_service_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/android/web_contents_observer_proxy.cc
diff --git a/content/browser/android/web_contents_observer_proxy.cc b/content/browser/android/web_contents_observer_proxy.cc
index 759fad9276dfb0c529172eb638e5f72e3b401cb3..feaa3312573be9f038692e6d0467ac4192833c6e 100644
--- a/content/browser/android/web_contents_observer_proxy.cc
+++ b/content/browser/android/web_contents_observer_proxy.cc
@@ -136,7 +136,7 @@ void WebContentsObserverProxy::DidStartNavigation(
ConvertUTF8ToJavaString(env, navigation_handle->GetURL().spec()));
Java_WebContentsObserverProxy_didStartNavigation(
env, obj, jstring_url, navigation_handle->IsInMainFrame(),
- navigation_handle->IsSamePage(), navigation_handle->IsErrorPage());
+ navigation_handle->IsSameDocument(), navigation_handle->IsErrorPage());
}
void WebContentsObserverProxy::DidFinishNavigation(
@@ -146,7 +146,7 @@ void WebContentsObserverProxy::DidFinishNavigation(
ScopedJavaLocalRef<jstring> jstring_url(
ConvertUTF8ToJavaString(env, navigation_handle->GetURL().spec()));
- bool is_fragment_navigation = navigation_handle->IsSamePage();
+ bool is_fragment_navigation = navigation_handle->IsSameDocument();
if (navigation_handle->HasCommitted()) {
// See http://crbug.com/251330 for why it's determined this way.
@@ -164,7 +164,7 @@ void WebContentsObserverProxy::DidFinishNavigation(
Java_WebContentsObserverProxy_didFinishNavigation(
env, obj, jstring_url, navigation_handle->IsInMainFrame(),
navigation_handle->IsErrorPage(), navigation_handle->HasCommitted(),
- navigation_handle->IsSamePage(), is_fragment_navigation,
+ navigation_handle->IsSameDocument(), is_fragment_navigation,
navigation_handle->HasCommitted() ? navigation_handle->GetPageTransition()
: -1,
navigation_handle->GetNetErrorCode(), jerror_description,
« no previous file with comments | « components/zoom/zoom_controller.cc ('k') | content/browser/bluetooth/web_bluetooth_service_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698