Use visible entry for website settings dialog.

chrome/browser/ui/android/website_settings_popup_android.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/android/website_settings_popup_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "chrome/browser/android/resource_mapper.h"
@@ skipping 18 matching lines @@
 using base::android::ScopedJavaLocalRef;
 using content::CertStore;
 using content::WebContents;
 
 static jobjectArray GetCertificateChain(JNIEnv* env,
                                         jobject obj,
                                         jobject view) {
   content::WebContents* contents =
       content::ContentViewCore::GetNativeContentViewCore(env, view)->
           GetWebContents();
-  int cert_id = contents->GetController().GetActiveEntry()->GetSSL().cert_id;
+  int cert_id = contents->GetController().GetVisibleEntry()->GetSSL().cert_id;
   scoped_refptr<net::X509Certificate> cert;
   bool ok = CertStore::GetInstance()->RetrieveCert(cert_id, &cert);
   CHECK(ok);
 
   std::vector<std::string> cert_chain;
   net::X509Certificate::OSCertHandles cert_handles =
       cert->GetIntermediateCertificates();
   // Make sure the peer's own cert is the first in the chain, if it's not
   // already there.
   if (cert_handles.empty() || cert_handles[0] != cert->os_cert_handle())
@@ skipping 20 matching lines @@
                                        WebContents* web_contents) {
   new WebsiteSettingsPopupAndroid(env, context, java_content_view,
                                   web_contents);
 }
 
 WebsiteSettingsPopupAndroid::WebsiteSettingsPopupAndroid(
     JNIEnv* env,
     jobject context,
     jobject java_content_view,
     WebContents* web_contents) {
-  if (web_contents->GetController().GetActiveEntry() == NULL)
+  // Important to use GetVisibleEntry to match what's showing in the omnibox.
+  content::NavigationEntry* nav_entry =
+      web_contents->GetController().GetVisibleEntry();
+  if (nav_entry == NULL)
     return;
 
   popup_jobject_.Reset(
       Java_WebsiteSettingsPopup_create(env, context, java_content_view,
                                        reinterpret_cast<jint>(this)));
 
   presenter_.reset(new WebsiteSettings(
       this,
       Profile::FromBrowserContext(web_contents->GetBrowserContext()),
       TabSpecificContentSettings::FromWebContents(web_contents),
       InfoBarService::FromWebContents(web_contents),
-      web_contents->GetURL(),
-      web_contents->GetController().GetActiveEntry()->GetSSL(),
+      nav_entry->GetURL(),
+      nav_entry->GetSSL(),
       content::CertStore::GetInstance()));
 }
 
 WebsiteSettingsPopupAndroid::~WebsiteSettingsPopupAndroid() {}
 
 void WebsiteSettingsPopupAndroid::Destroy(JNIEnv* env, jobject obj) {
   delete this;
 }
 
 void WebsiteSettingsPopupAndroid::SetIdentityInfo(
@@ skipping 67 matching lines @@
 void WebsiteSettingsPopupAndroid::SetFirstVisit(
     const string16& first_visit) {
   NOTIMPLEMENTED();
 }
 
 // static
 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid(
     JNIEnv* env) {
   return RegisterNativesImpl(env);
 }