Handle about:blank in the Origin Info Bubble better.

chrome/browser/ui/views/location_bar/location_icon_view.cc

 // Copyright (c) 2012 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/views/location_bar/location_icon_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ssl/chrome_security_state_model_client.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/components_scaled_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/painter.h"
+#include "url/origin.h"
 
 using content::NavigationController;
 using content::NavigationEntry;
 using content::WebContents;
 
 namespace {
 
 void ProcessEventInternal(LocationBarView* view) {
   WebContents* contents = view->GetWebContents();
   if (!contents)
     return;
 
   // Important to use GetVisibleEntry to match what's showing in the omnibox.
   NavigationEntry* entry = contents->GetController().GetVisibleEntry();
-  // The visible entry can be nullptr in the case of window.open("").
-  if (!entry)
-    return;
+
+  // Show the origin if it's not unique, and otherwise fall back to the URL.
+  //
+  // TODO(palmer): Should we show the "this is a secure Chromium page"
+  // OIB when origin is unique and there is no last committed origin?
+  url::Origin origin = entry
+                           ? entry->GetOrigin()
+                           : contents->GetMainFrame()->GetLastCommittedOrigin();
+  GURL url(origin.Serialize());
+  if (entry && origin.unique()) {
+    url = GURL(contents->GetMainFrame()->GetLastCommittedOrigin().Serialize());
+  }
 
   ChromeSecurityStateModelClient* model_client =
       ChromeSecurityStateModelClient::FromWebContents(contents);
   DCHECK(model_client);
 
-  view->delegate()->ShowWebsiteSettings(contents, entry->GetURL(),
+  // TODO(palmer): Change ShowWebsiteSettings to take an Origin, rather than a
+  // GURL.
+  view->delegate()->ShowWebsiteSettings(contents, url,
                                         model_client->GetSecurityInfo());
 }
 
 }  // namespace
 
 LocationIconView::LocationIconView(const gfx::FontList& font_list,
                                    SkColor parent_background_color,
                                    LocationBarView* location_bar)
     : IconLabelBubbleView(IDR_OMNIBOX_HTTPS_INVALID,
                           font_list,
@@ skipping 115 matching lines @@
   return size;
 }
 
 void LocationIconView::SetBackground(bool should_show_ev) {
   static const int kEvBackgroundImages[] = IMAGE_GRID(IDR_OMNIBOX_EV_BUBBLE);
   if (should_show_ev)
     SetBackgroundImageGrid(kEvBackgroundImages);
   else
     UnsetBackgroundImageGrid();
 }