Experiment with displaying origins in the Omnibox.

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 194 matching lines @@
                                  Delegate* delegate,
                                  bool is_popup_mode)
     : LocationBar(profile),
       OmniboxEditController(command_updater),
       browser_(browser),
       omnibox_view_(NULL),
       delegate_(delegate),
       origin_chip_view_(NULL),
       location_icon_view_(NULL),
       ev_bubble_view_(NULL),
+      good_bubble_view_(NULL),
+      dubious_bubble_view_(NULL),
+      bad_bubble_view_(NULL),
       ime_inline_autocomplete_view_(NULL),
       selected_keyword_view_(NULL),
       suggested_text_view_(NULL),
       keyword_hint_view_(NULL),
       mic_search_view_(NULL),
       zoom_view_(NULL),
       generated_credit_card_view_(NULL),
       open_pdf_in_reader_view_(NULL),
       manage_passwords_icon_view_(NULL),
       translate_icon_view_(NULL),
@@ skipping 62 matching lines @@
   // images have 1 px thick edges, which we don't want to overlap.
   const int kBubbleInteriorVerticalPadding = 1;
   const int bubble_vertical_padding =
       (kBubblePadding + kBubbleInteriorVerticalPadding) * 2;
   const gfx::FontList bubble_font_list(
       GetLargestFontListWithHeightBound(
           font_list, location_height - bubble_vertical_padding));
 
   const SkColor background_color =
       GetColor(ToolbarModel::NONE, LocationBarView::BACKGROUND);
+
   ev_bubble_view_ = new EVBubbleView(
       bubble_font_list, GetColor(ToolbarModel::EV_SECURE, SECURITY_TEXT),
       background_color, this);
   ev_bubble_view_->set_drag_controller(this);
   AddChildView(ev_bubble_view_);
 
+  good_bubble_view_ = new EVBubbleView(
+      bubble_font_list, GetColor(ToolbarModel::SECURE, SECURITY_TEXT),
+      background_color, this);
+  good_bubble_view_->set_drag_controller(this);
+  AddChildView(good_bubble_view_);
+
+  dubious_bubble_view_ = new EVBubbleView(
+      bubble_font_list, GetColor(ToolbarModel::SECURITY_WARNING, SECURITY_TEXT),
+      background_color, this);
+  dubious_bubble_view_->set_drag_controller(this);
+  AddChildView(dubious_bubble_view_);
+
+  bad_bubble_view_ = new EVBubbleView(
+      bubble_font_list, GetColor(ToolbarModel::SECURITY_ERROR, SECURITY_TEXT),
+      background_color, this);
+  bad_bubble_view_->set_drag_controller(this);
+  AddChildView(bad_bubble_view_);
+
   // Initialize the Omnibox view.
   omnibox_view_ = new OmniboxViewViews(
       this, profile(), command_updater(),
       is_popup_mode_ ||
           (browser_->is_app() && CommandLine::ForCurrentProcess()->
               HasSwitch(switches::kEnableStreamlinedHostedApps)),
       this, font_list);
   omnibox_view_->Init();
   omnibox_view_->SetFocusable(true);
   AddChildView(omnibox_view_);
@@ skipping 377 matching lines @@
 }
 
 void LocationBarView::Layout() {
   if (!IsInitialized())
     return;
 
   origin_chip_view_->SetVisible(GetToolbarModel()->ShouldShowOriginChip());
   selected_keyword_view_->SetVisible(false);
   location_icon_view_->SetVisible(false);
   ev_bubble_view_->SetVisible(false);
+  good_bubble_view_->SetVisible(false);
+  dubious_bubble_view_->SetVisible(false);
+  bad_bubble_view_->SetVisible(false);
   keyword_hint_view_->SetVisible(false);
 
   LocationBarLayout leading_decorations(
       LocationBarLayout::LEFT_EDGE,
       kItemPadding - GetEditLeadingInternalSpace());
   LocationBarLayout trailing_decorations(LocationBarLayout::RIGHT_EDGE,
                                          kItemPadding);
 
   const int origin_chip_preferred_width =
       origin_chip_view_->GetPreferredSize().width();
@@ skipping 34 matching lines @@
         selected_keyword_view_->set_is_extension_icon(false);
       }
     }
   } else if (ShouldShowEVBubble()) {
     ev_bubble_view_->SetLabel(GetToolbarModel()->GetEVCertName());
     // The largest fraction of the omnibox that can be taken by the EV bubble.
     const double kMaxBubbleFraction = 0.5;
     leading_decorations.AddDecoration(bubble_location_y, bubble_height, false,
                                       kMaxBubbleFraction, kBubblePadding,
                                       kItemPadding, ev_bubble_view_);
+  } else if (ShouldShowGoodBubble()) {
+    good_bubble_view_->SetLabel(GetToolbarModel()->GetOriginDisplayName());
+    // The largest fraction of the omnibox that can be taken by the Good bubble.
+    const double kMaxBubbleFraction = 0.5;
+    leading_decorations.AddDecoration(bubble_location_y, bubble_height, false,
+                                      kMaxBubbleFraction, kBubblePadding,
+                                      kItemPadding, good_bubble_view_);
+  } else if (ShouldShowDubiousBubble()) {
+    dubious_bubble_view_->SetLabel(GetToolbarModel()->GetOriginDisplayName());
+    // The largest fraction of the omnibox that can be taken by the Dubious
+    // bubble.
+    const double kMaxBubbleFraction = 0.5;
+    leading_decorations.AddDecoration(bubble_location_y, bubble_height, false,
+                                      kMaxBubbleFraction, kBubblePadding,
+                                      kItemPadding, dubious_bubble_view_);
+  } else if (ShouldShowBadBubble()) {
+    bad_bubble_view_->SetLabel(GetToolbarModel()->GetOriginDisplayName());
+    // The largest fraction of the omnibox that can be taken by the Bad bubble.
+    const double kMaxBubbleFraction = 0.5;
+    leading_decorations.AddDecoration(bubble_location_y, bubble_height, false,
+                                      kMaxBubbleFraction, kBubblePadding,
+                                      kItemPadding, bad_bubble_view_);
   } else if (!origin_chip_view_->visible()) {
     leading_decorations.AddDecoration(
         vertical_edge_thickness(), location_height,
         location_icon_view_);
   }
 
   if (star_view_->visible()) {
     trailing_decorations.AddDecoration(
         vertical_edge_thickness(), location_height, star_view_);
   }
@@ skipping 517 matching lines @@
 bool LocationBarView::ShouldShowKeywordBubble() const {
   return !omnibox_view_->model()->keyword().empty() &&
       !omnibox_view_->model()->is_keyword_hint();
 }
 
 bool LocationBarView::ShouldShowEVBubble() const {
   return !chrome::ShouldDisplayOriginChip() &&
       (GetToolbarModel()->GetSecurityLevel(false) == ToolbarModel::EV_SECURE);
 }
 
+bool LocationBarView::ShouldShowGoodBubble() const {
+  return !chrome::ShouldDisplayOriginChip() &&
+      (GetToolbarModel()->GetSecurityLevel(false) == ToolbarModel::SECURE);
+}
+
+bool LocationBarView::ShouldShowDubiousBubble() const {
+  ToolbarModel::SecurityLevel security =
+      GetToolbarModel()->GetSecurityLevel(false);
+  return !chrome::ShouldDisplayOriginChip() &&
+      (security == ToolbarModel::SECURITY_POLICY_WARNING ||
+       security == ToolbarModel::SECURITY_WARNING);
+}
+
+bool LocationBarView::ShouldShowBadBubble() const {
+  ToolbarModel::SecurityLevel security =
+      GetToolbarModel()->GetSecurityLevel(false);
+  return !chrome::ShouldDisplayOriginChip() &&
+      (security == ToolbarModel::NONE ||
+       security == ToolbarModel::SECURITY_ERROR);
+}
+
 double LocationBarView::GetValueForAnimation(bool hide) const {
   int calculated_offset;
   const gfx::Tween::Type tween_type = hide ? kHideTweenType : kShowTweenType;
   int start_offset = starting_omnibox_offset_, end_offset = 0;
   if (hide)
     std::swap(start_offset, end_offset);
   const int desired_offset = abs(current_omnibox_offset_);
   // Binary-search the value space (0 <= value <= 1) to find the appropriate
   // position.  We only bother to iterate to within 1/64 of the desired value,
   // because the longer of the two animations will only run for twelve frames
@@ skipping 462 matching lines @@
 
 void LocationBarView::ModelChanged(const SearchModel::State& old_state,
                                    const SearchModel::State& new_state) {
   const bool visible = !GetToolbarModel()->input_in_progress() &&
       new_state.voice_search_supported;
   if (mic_search_view_->visible() != visible) {
     mic_search_view_->SetVisible(visible);
     Layout();
   }
 }