Omnibox improvements and fixes.

chrome/browser/android/vr_shell/vr_web_contents_observer.cc

Index: chrome/browser/android/vr_shell/vr_web_contents_observer.cc
diff --git a/chrome/browser/android/vr_shell/vr_web_contents_observer.cc b/chrome/browser/android/vr_shell/vr_web_contents_observer.cc
index 84165bd3865c8728f691ba705cce8e582f7dc693..f909df4a90d10afce5e300cb6c064849d7cd472b 100644
--- a/chrome/browser/android/vr_shell/vr_web_contents_observer.cc
+++ b/chrome/browser/android/vr_shell/vr_web_contents_observer.cc
@@ -5,6 +5,8 @@
 #include "chrome/browser/android/vr_shell/vr_web_contents_observer.h"
 
 #include "chrome/browser/android/vr_shell/ui_interface.h"
+#include "chrome/browser/ssl/security_state_tab_helper.h"
+#include "components/security_state/core/security_state.h"
 #include "content/public/browser/navigation_handle.h"
 
 namespace vr_shell {
@@ -12,7 +14,10 @@ namespace vr_shell {
 VrWebContentsObserver::VrWebContentsObserver(content::WebContents* web_contents,
                                              UiInterface* ui_interface)
     : WebContentsObserver(web_contents),
-      ui_interface_(ui_interface) {}
+      ui_interface_(ui_interface) {
+  ui_interface_->SetURL(web_contents->GetVisibleURL());
+  SetSecurityLevel();
+}
 
 VrWebContentsObserver::~VrWebContentsObserver() {}
 
@@ -30,23 +35,39 @@ void VrWebContentsObserver::DidStopLoading() {
 
 void VrWebContentsObserver::DidStartNavigation(
     content::NavigationHandle* navigation_handle) {
-  ui_interface_->SetURL(navigation_handle->GetURL());
+  if (navigation_handle->IsInMainFrame()) {
+    ui_interface_->SetURL(navigation_handle->GetURL());
+    SetSecurityLevel();

[estark, 2016/12/02 23:48:50]

Drive-by (not intending to block this CL, just noting something that should be
addressed in future)... the security level can also change after a navigation
has completed, see WebContents::DidChangeVisibleSecurityState. (For example,
mixed content can appear on the page dynamically.)

There isn't currently a WebContentsObserver method that does exactly what you
want to pick up DidChangeVisibleSecurityState events. I think we can make that
work with a little refactoring though: I'd suggest renaming
WebContentsObserver::SecurityStyleChanged to
WebContentsObserver::VisibleSecurityStateChanged and removing its arguments.
Implementations that use the arguments can obtain them directly from
WebContents::delegate()->GetSecurityStyle(). Then you can update the security
level from a WebContentsObserver::VisibleSecurityStateChanged implementation
here.

(This should be better documented somewhere, but in case you're wondering,
SecurityStyleChanged conveys security state info to observers in //content. The
blink::WebSecurityStyle enum is a lossy representation of SecurityLevel, since
the latter contains Chrome-specific security information that //content doesn't
know about.)

+  }
 }
 
 void VrWebContentsObserver::DidRedirectNavigation(
     content::NavigationHandle* navigation_handle) {
-  ui_interface_->SetURL(navigation_handle->GetURL());
+  if (navigation_handle->IsInMainFrame()) {
+    ui_interface_->SetURL(navigation_handle->GetURL());
+    SetSecurityLevel();
+  }
 }
 
 void VrWebContentsObserver::DidFinishNavigation(
     content::NavigationHandle* navigation_handle) {
-  ui_interface_->SetURL(navigation_handle->GetURL());
+  if (navigation_handle->IsInMainFrame()) {
+    ui_interface_->SetURL(navigation_handle->GetURL());
+    SetSecurityLevel();
+  }
+}
+
+void VrWebContentsObserver::SetSecurityLevel() {
+  const auto* helper = SecurityStateTabHelper::FromWebContents(web_contents());
+  DCHECK(helper);
+  security_state::SecurityInfo security_info;
+  helper->GetSecurityInfo(&security_info);
+  ui_interface_->SetSecurityLevel(security_info.security_level);
 }
 
 void VrWebContentsObserver::DidToggleFullscreenModeForTab(
     bool entered_fullscreen, bool will_cause_resize) {
-  // TODO(amp): Use will_cause_resize to signal ui of pending size changes.
-  ui_interface_->SetCinemaMode(entered_fullscreen);
+  ui_interface_->SetFullscreen(entered_fullscreen);
 }
 
 }  // namespace vr_shell