Chromium Code Reviews| Index: android_webview/native/aw_contents.cc |
| diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc |
| index 99752bc63aac42530bdba22d14d7cf4061813890..42992ae42853c04ef1c173077d284a947c9fe360 100644 |
| --- a/android_webview/native/aw_contents.cc |
| +++ b/android_webview/native/aw_contents.cc |
| @@ -691,7 +691,7 @@ void AwContents::OnReceivedIcon(const GURL& icon_url, const SkBitmap& bitmap) { |
| return; |
| content::NavigationEntry* entry = |
| - web_contents_->GetController().GetActiveEntry(); |
| + web_contents_->GetController().GetLastCommittedEntry(); |
| if (entry) { |
|
nasko
2015/07/03 10:00:59
Just a generic comment for the overall code struct
Torne
2015/07/03 10:12:59
Hm, possibly :/
File a bug and we can look into i
|
| entry->GetFavicon().valid = true; |
| @@ -743,12 +743,12 @@ void AwContents::OnNewPicture() { |
| } |
| } |
| -base::android::ScopedJavaLocalRef<jbyteArray> |
| - AwContents::GetCertificate(JNIEnv* env, |
| - jobject obj) { |
| +base::android::ScopedJavaLocalRef<jbyteArray> AwContents::GetCertificate( |
| + JNIEnv* env, |
| + jobject obj) { |
| DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| content::NavigationEntry* entry = |
| - web_contents_->GetController().GetActiveEntry(); |
| + web_contents_->GetController().GetLastCommittedEntry(); |
| if (!entry) |
| return ScopedJavaLocalRef<jbyteArray>(); |
| // Get the certificate |