Omnibox improvements and fixes.

chrome/browser/android/vr_shell/vr_web_contents_observer.cc

 // Copyright 2016 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/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 {
 
 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() {}
 
 void VrWebContentsObserver::SetUiInterface(UiInterface* ui_interface) {
   ui_interface_ = ui_interface;
 }
 
 void VrWebContentsObserver::DidStartLoading() {
   ui_interface_->SetLoading(true);
 }
 
 void VrWebContentsObserver::DidStopLoading() {
   ui_interface_->SetLoading(false);
 }
 
 void VrWebContentsObserver::DidStartNavigation(
     content::NavigationHandle* navigation_handle) {
-  ui_interface_->SetURL(navigation_handle->GetURL());
+  if (navigation_handle->IsInMainFrame()) {
+    ui_interface_->SetURL(navigation_handle->GetURL());
+    SetSecurityLevel();
+  }
 }
 
 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());
+  CHECK(helper);

[bshe, 2016/12/01 15:32:46]

Perhaps a DCHECK here so the code is not in production?

[cjgrant, 2016/12/01 21:21:51]

The last time we discussed CHECK/DCHECK, we settled on using CHECK for anything
security-impacting (see ui_scene.cc, etc).  This is definitely security
impacting, so it seems prudent to bail out if we can't obtain the correct
security status, right?

[bshe, 2016/12/02 14:21:36]

My understanding is that it is better to use DCHECK for nullity. Since if helper
is null, the code would crash anyway without the CHECK.
And the point of using DCHECK is to let other commiters know that you are
expecting helper never be null
 and they shouldn't try to add code which handle null case below.

[cjgrant, 2016/12/02 15:39:50]

Done.

+  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.
   int mode = ui_interface_->GetMode();
   if (entered_fullscreen && mode == UiInterface::Mode::STANDARD) {
     ui_interface_->SetMode(UiInterface::Mode::CINEMA);
   }
   if (!entered_fullscreen && mode == UiInterface::Mode::CINEMA) {
     ui_interface_->SetMode(UiInterface::Mode::STANDARD);
   }
 }
 
 }  // namespace vr_shell