Render extension URLs with chips

chrome/browser/ui/views/location_bar/location_bar_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_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/command_line.h"
@@ skipping 478 matching lines @@
     return min_size;
 
   min_size.set_height(min_size.height() * size_animation_.GetCurrentValue());
 
   // Compute width of omnibox-leading content.
   const int edge_thickness = GetHorizontalEdgeThickness();
   int leading_width = edge_thickness;
   if (ShouldShowKeywordBubble()) {
     // The selected keyword view can collapse completely.
   } else if (ShouldShowSecurityChip()) {
-    base::string16 security_text = GetSecurityText();
+    const base::string16 security_text = GetSecurityText();
     leading_width +=
         location_icon_view_->GetMinimumSizeForLabelText(security_text).width();
+  } else if (ShouldShowExtensionChip()) {
+    const base::string16 extension_name = GetExtensionName(
+        GetToolbarModel()->GetURL(), delegate_->GetWebContents());
+    leading_width +=
+        location_icon_view_->GetMinimumSizeForLabelText(extension_name).width();
   } else {
     leading_width +=
         kHorizontalPadding + location_icon_view_->GetMinimumSize().width();
   }
 
   // Compute width of omnibox-trailing content.
   int trailing_width = edge_thickness;
   trailing_width += IncrementalMinimumWidth(star_view_) +
                     IncrementalMinimumWidth(translate_icon_view_) +
                     IncrementalMinimumWidth(open_pdf_in_reader_view_) +
@@ skipping 50 matching lines @@
           GetTemplateURLForKeyword(keyword);
       if (template_url &&
           (template_url->type() == TemplateURL::OMNIBOX_API_EXTENSION)) {
         gfx::Image image = extensions::OmniboxAPI::Get(profile())->
             GetOmniboxIcon(template_url->GetExtensionId());
         selected_keyword_view_->SetImage(image.AsImageSkia());
       } else {
         selected_keyword_view_->ResetImage();
       }
     }
+  } else if (ShouldShowExtensionChip()) {
+    location_icon_view_->SetLabel(GetExtensionName(
+        GetToolbarModel()->GetURL(), delegate_->GetWebContents()));
+    const double kMaxBubbleFraction = 0.5;
+    leading_decorations.AddDecoration(vertical_padding, location_height, false,
+                                      kMaxBubbleFraction, 0, item_padding,
+                                      location_icon_view_);
   } else if (ShouldShowSecurityChip()) {
     location_icon_view_->SetLabel(GetSecurityText());
     // The largest fraction of the omnibox that can be taken by the EV bubble.
     const double kMaxBubbleFraction = 0.5;
     leading_decorations.AddDecoration(vertical_padding, location_height, false,
                                       kMaxBubbleFraction, 0, item_padding,
                                       location_icon_view_);
   } else {
     leading_decorations.AddDecoration(vertical_padding, location_height,
                                       location_icon_view_);
@@ skipping 110 matching lines @@
   open_pdf_in_reader_view_->Update(web_contents_for_sub_views);
 
   if (star_view_)
     UpdateBookmarkStarVisibility();
 
   if (contents)
     omnibox_view_->OnTabChanged(contents);
   else
     omnibox_view_->Update();
 
-  location_icon_view_->SetSecurityState(
-      ShouldShowSecurityChip(), !contents && ShouldAnimateSecurityChip());
-
+  location_icon_view_->SetDisplayState(
+      ShouldShowSecurityChip() || ShouldShowExtensionChip(),
+      !contents && ShouldAnimateSecurityChip());
   OnChanged();  // NOTE: Calls Layout().
 }
 
 void LocationBarView::ResetTabState(WebContents* contents) {
   omnibox_view_->ResetTabState(contents);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarView, public OmniboxEditController implementation:
 
@@ skipping 234 matching lines @@
   SecurityLevel level = GetToolbarModel()->GetSecurityLevel(false);
   if (!ShouldShowSecurityChip())
     return false;
   if (level == SecurityLevel::SECURE || level == SecurityLevel::EV_SECURE)
     return should_animate_secure_state_;
   return should_animate_nonsecure_state_ &&
          (level == SecurityLevel::DANGEROUS ||
           level == SecurityLevel::HTTP_SHOW_WARNING);
 }
 
+bool LocationBarView::ShouldShowExtensionChip() const {
+  return GetToolbarModel()->GetURL().SchemeIs(extensions::kExtensionScheme);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarView, private LocationBar implementation:
 
 void LocationBarView::ShowFirstRunBubble() {
   // Wait until search engines have loaded to show the first run bubble.
   TemplateURLService* url_service =
       TemplateURLServiceFactory::GetForProfile(profile());
   if (!url_service->loaded()) {
     template_url_service_ = url_service;
     template_url_service_->AddObserver(this);
@@ skipping 295 matching lines @@
 // LocationBarView, private TemplateURLServiceObserver implementation:
 
 void LocationBarView::OnTemplateURLServiceChanged() {
   template_url_service_->RemoveObserver(this);
   template_url_service_ = nullptr;
   // If the browser is no longer active, let's not show the info bubble, as this
   // would make the browser the active window again.
   if (omnibox_view_ && omnibox_view_->GetWidget()->IsActive())
     ShowFirstRunBubble();
 }