Upstream ContentView.getNavigationHistory()

content/browser/android/content_view_core_impl.cc

Index: content/browser/android/content_view_core_impl.cc
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index 7693343b90e27cc020564635628278a0c81f2153..4b2925fd2ac14c33ca61e01e425e78e428f96291 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -18,7 +18,9 @@
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
 #include "content/browser/web_contents/navigation_controller_impl.h"
 #include "content/public/browser/browser_context.h"
+#include "content/public/browser/favicon_status.h"
 #include "content/public/browser/interstitial_page.h"
+#include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
@@ -28,6 +30,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/android/WebInputEventFactory.h"
+#include "ui/gfx/android/java_bitmap.h"
 #include "webkit/glue/webmenuitem.h"
 
 using base::android::AttachCurrentThread;
@@ -396,6 +399,39 @@ void ContentViewCoreImpl::RemoveJavascriptInterface(JNIEnv* env,
       ConvertJavaStringToUTF16(env, name));
 }
 
+int ContentViewCoreImpl::GetNavigationHistory(JNIEnv* env,
+                                              jobject obj,
+                                              jobject context) {
+  // Iterate through navigation entries to populate the list
+  const NavigationController& controller = web_contents_->GetController();
+  int count = controller.GetEntryCount();
+  for (int i = 0; i < count; ++i) {
+    NavigationEntry* entry = controller.GetEntryAtIndex(i);
+
+    // Get the details of the current entry
+    ScopedJavaLocalRef<jstring> j_url = ConvertUTF8ToJavaString(env,
+        entry->GetURL().spec());
+    ScopedJavaLocalRef<jstring> j_virtual_url = ConvertUTF8ToJavaString(env,
+        entry->GetVirtualURL().spec());
+    ScopedJavaLocalRef<jstring> j_original_url = ConvertUTF8ToJavaString(env,
+        entry->GetOriginalRequestURL().spec());
+    ScopedJavaLocalRef<jstring> j_title = ConvertUTF16ToJavaString(env,
+        entry->GetTitle());
+    ScopedJavaLocalRef<jobject> j_bitmap;
+    const FaviconStatus& status = entry->GetFavicon();
+    if (status.valid && status.image.ToSkBitmap()->getSize() > 0) {
+      j_bitmap = gfx::ConvertToJavaBitmap(status.image.ToSkBitmap());
+    }
+
+    // Add the item to the list
+    Java_ContentViewCore_addToNavigationHistory(env, obj, context, j_url.obj(),
+        j_virtual_url.obj(), j_original_url.obj(), j_title.obj(),
+        j_bitmap.obj());
+  }
+
+  return controller.GetCurrentEntryIndex();
+}
+
 // --------------------------------------------------------------------------
 // Methods called from native code
 // --------------------------------------------------------------------------