Omnibox M5 work, part 1: Security changes...

chrome/browser/gtk/location_bar_view_gtk.cc

 // Copyright (c) 2010 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/gtk/location_bar_view_gtk.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 58 matching lines @@
 // as well the tab to search box and other widgets need to have the padding on
 // top and bottom to avoid drawing larger than the location bar space.
 const int kHboxBorder = 4;
 
 // Padding between the elements in the bar.
 static const int kInnerPadding = 4;
 
 // TODO(deanm): Eventually this should be painted with the background png
 // image, but for now we get pretty close by just drawing a solid border.
 const GdkColor kBorderColor = GDK_COLOR_RGB(0xbe, 0xc8, 0xd4);
-const GdkColor kEvTextColor = GDK_COLOR_RGB(0x00, 0x96, 0x14);  // Green.
+const GdkColor kEvSecureTextColor = GDK_COLOR_RGB(0x07, 0x95, 0x00);
+const GdkColor kSecurityErrorTextColor = GDK_COLOR_RGB(0xa2, 0x00, 0x00);
 const GdkColor kKeywordBackgroundColor = GDK_COLOR_RGB(0xf0, 0xf4, 0xfa);
 const GdkColor kKeywordBorderColor = GDK_COLOR_RGB(0xcb, 0xde, 0xf7);
 
 // Use weak gray for showing search and keyword hint text.
 const GdkColor kHintTextColor = GDK_COLOR_RGB(0x75, 0x75, 0x75);
 
 // Size of the rounding of the "Search site for:" box.
 const int kCornerSize = 3;
 
 // Returns the short name for a keyword.
@@ skipping 34 matching lines @@
   base::i18n::AdjustStringForLocaleDirection(min_string, &min_string);
   return min_string;
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarViewGtk
 
 // static
-const GdkColor LocationBarViewGtk::kBackgroundColorByLevel[3] = {
-  GDK_COLOR_RGB(255, 245, 195),  // SecurityLevel SECURE: Yellow.
-  GDK_COLOR_RGB(255, 255, 255),  // SecurityLevel NORMAL: White.
-  GDK_COLOR_RGB(255, 255, 255),  // SecurityLevel INSECURE: White.
-};
+const GdkColor LocationBarViewGtk::kBackgroundColor =
+    GDK_COLOR_RGB(255, 255, 255);
 
 LocationBarViewGtk::LocationBarViewGtk(
     const BubblePositioner* bubble_positioner,
     Browser* browser)
     : security_icon_event_box_(NULL),
-      security_lock_icon_image_(NULL),
+      ev_secure_icon_image_(NULL),
+      secure_icon_image_(NULL),
       security_warning_icon_image_(NULL),
-      info_label_(NULL),
+      security_error_icon_image_(NULL),
+      security_info_label_(NULL),
       tab_to_search_box_(NULL),
       tab_to_search_full_label_(NULL),
       tab_to_search_partial_label_(NULL),
       tab_to_search_hint_(NULL),
       tab_to_search_hint_leading_label_(NULL),
       tab_to_search_hint_icon_(NULL),
       tab_to_search_hint_trailing_label_(NULL),
       type_to_search_hint_(NULL),
       profile_(NULL),
       command_updater_(browser->command_updater()),
@@ skipping 30 matching lines @@
 
   hbox_.Own(gtk_hbox_new(FALSE, kInnerPadding));
   gtk_container_set_border_width(GTK_CONTAINER(hbox_.get()), kHboxBorder);
   // We will paint for the alignment, to paint the background and border.
   gtk_widget_set_app_paintable(hbox_.get(), TRUE);
   // Redraw the whole location bar when it changes size (e.g., when toggling
   // the home button on/off.
   gtk_widget_set_redraw_on_allocate(hbox_.get(), TRUE);
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  security_lock_icon_image_ = gtk_image_new_from_pixbuf(
-      rb.GetPixbufNamed(IDR_LOCK));
-  gtk_widget_set_name(security_lock_icon_image_, "chrome-security-lock-icon");
-  gtk_widget_hide(GTK_WIDGET(security_lock_icon_image_));
-  security_warning_icon_image_ = gtk_image_new();
+  ev_secure_icon_image_ =
+      gtk_image_new_from_pixbuf(rb.GetPixbufNamed(IDR_EV_SECURE));
+  gtk_widget_set_name(ev_secure_icon_image_, "chrome-ev-secure-icon");
+  secure_icon_image_ = gtk_image_new_from_pixbuf(rb.GetPixbufNamed(IDR_SECURE));
+  gtk_widget_set_name(secure_icon_image_, "chrome-secure-icon");
+  security_warning_icon_image_ =
+      gtk_image_new_from_pixbuf(rb.GetPixbufNamed(IDR_SECURITY_WARNING));
   gtk_widget_set_name(security_warning_icon_image_,
                       "chrome-security-warning-icon");
-  gtk_widget_hide(GTK_WIDGET(security_warning_icon_image_));
+  security_error_icon_image_ =
+      gtk_image_new_from_pixbuf(rb.GetPixbufNamed(IDR_SECURITY_ERROR));
+  gtk_widget_set_name(security_error_icon_image_,
+                      "chrome-security-error-icon");
 
-  info_label_ = gtk_label_new(NULL);
-  gtk_widget_modify_base(info_label_, GTK_STATE_NORMAL,
-      &LocationBarViewGtk::kBackgroundColorByLevel[0]);
-  gtk_widget_hide(GTK_WIDGET(info_label_));
-  gtk_widget_set_name(info_label_,
-                      "chrome-location-bar-info-label");
+  security_info_label_ = gtk_label_new(NULL);
+  gtk_widget_modify_base(security_info_label_, GTK_STATE_NORMAL,
+                         &LocationBarViewGtk::kBackgroundColor);
+  gtk_widget_set_name(security_info_label_,
+                      "chrome-location-bar-security-info-label");
 
   g_signal_connect(hbox_.get(), "expose-event",
                    G_CALLBACK(&HandleExposeThunk), this);
 
   // Put |tab_to_search_box_|, |location_entry_|, |tab_to_search_hint_| and
   // |type_to_search_hint_| into a sub hbox, so that we can make this part
   // horizontally shrinkable without affecting other elements in the location
   // bar.
   GtkWidget* entry_box = gtk_hbox_new(FALSE, kInnerPadding);
   gtk_widget_show(entry_box);
@@ skipping 40 matching lines @@
                               kTopMargin + kBorderThickness,
                               kBottomMargin + kBorderThickness,
                               kBorderThickness,
                               kBorderThickness);
   } else {
     gtk_alignment_set_padding(GTK_ALIGNMENT(align),
                               kTopMargin + kBorderThickness,
                               kBottomMargin + kBorderThickness,
                               0, 0);
   }
-  gtk_container_add(GTK_CONTAINER(align), location_entry_->widget());
+  gtk_container_add(GTK_CONTAINER(align), location_entry_->GetNativeView());
   gtk_box_pack_start(GTK_BOX(entry_box), align, TRUE, TRUE, 0);
 
   // Tab to search notification (the hint on the right hand side).
   tab_to_search_hint_ = gtk_hbox_new(FALSE, 0);
   gtk_widget_set_name(tab_to_search_hint_, "chrome-tab-to-search-hint");
   tab_to_search_hint_leading_label_ = gtk_label_new(NULL);
   gtk_widget_set_sensitive(tab_to_search_hint_leading_label_, FALSE);
   tab_to_search_hint_icon_ = gtk_image_new_from_pixbuf(
       rb.GetPixbufNamed(IDR_LOCATION_BAR_KEYWORD_HINT_TAB));
   tab_to_search_hint_trailing_label_ = gtk_label_new(NULL);
@@ skipping 13 matching lines @@
   // tab_to_search_hint_ gets hidden initially in OnChanged.  Hiding it here
   // doesn't work, someone is probably calling show_all on our parent box.
   gtk_box_pack_end(GTK_BOX(entry_box), tab_to_search_hint_, FALSE, FALSE, 0);
 
   // Type to search hint is on the right hand side.
   type_to_search_hint_ =
       gtk_label_new(l10n_util::GetStringUTF8(IDS_OMNIBOX_EMPTY_TEXT).c_str());
   gtk_widget_set_sensitive(type_to_search_hint_, FALSE);
   gtk_box_pack_end(GTK_BOX(entry_box), type_to_search_hint_, FALSE, FALSE, 0);
 
-  // Pack info_label_ and security icons in hbox.  We hide/show them
+  // Pack security_info_label_ and security icons in hbox.  We hide/show them
   // by SetSecurityIcon() and SetInfoText().
-  gtk_box_pack_end(GTK_BOX(hbox_.get()), info_label_, FALSE, FALSE, 0);
+  gtk_box_pack_end(GTK_BOX(hbox_.get()), security_info_label_, FALSE, FALSE, 0);
 
   GtkWidget* security_icon_box = gtk_hbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(security_icon_box),
-                     security_lock_icon_image_, FALSE, FALSE, 0);
+                     ev_secure_icon_image_, FALSE, FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(security_icon_box),
+                     secure_icon_image_, FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(security_icon_box),
                      security_warning_icon_image_, FALSE, FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(security_icon_box),
+                     security_error_icon_image_, FALSE, FALSE, 0);
 
   // GtkImage is a "no window" widget and requires a GtkEventBox to receive
   // events.
   security_icon_event_box_ = gtk_event_box_new();
   // Make the event box not visible so it does not paint a background.
   gtk_event_box_set_visible_window(GTK_EVENT_BOX(security_icon_event_box_),
                                    FALSE);
   g_signal_connect(security_icon_event_box_, "button-press-event",
                    G_CALLBACK(&OnSecurityIconPressed), this);
 
@@ skipping 20 matching lines @@
 
   page_action_hbox_.Own(gtk_hbox_new(FALSE, kInnerPadding));
   gtk_widget_set_name(page_action_hbox_.get(),
                       "chrome-page-action-hbox");
   gtk_box_pack_end(GTK_BOX(hbox_.get()), page_action_hbox_.get(),
                    FALSE, FALSE, 0);
 
   // Until we switch to vector graphics, force the font size of labels.
   gtk_util::ForceFontSizePixels(type_to_search_hint_,
       browser_defaults::kAutocompleteEditFontPixelSize);
-  gtk_util::ForceFontSizePixels(info_label_,
+  gtk_util::ForceFontSizePixels(security_info_label_,
       browser_defaults::kAutocompleteEditFontPixelSize);
   gtk_util::ForceFontSizePixels(tab_to_search_full_label_,
       browser_defaults::kAutocompleteEditFontPixelSize);
   gtk_util::ForceFontSizePixels(tab_to_search_partial_label_,
       browser_defaults::kAutocompleteEditFontPixelSize);
   gtk_util::ForceFontSizePixels(tab_to_search_hint_leading_label_,
       browser_defaults::kAutocompleteEditFontPixelSize);
   gtk_util::ForceFontSizePixels(tab_to_search_hint_trailing_label_,
       browser_defaults::kAutocompleteEditFontPixelSize);
   gtk_util::ForceFontSizePixels(type_to_search_hint_,
@@ skipping 37 matching lines @@
            page_action_views_.begin();
        iter != page_action_views_.end();
        ++iter) {
     if ((*iter)->page_action() == page_action)
       return (*iter)->widget();
   }
   return NULL;
 }
 
 void LocationBarViewGtk::Update(const TabContents* contents) {
-  SetSecurityIcon(toolbar_model_->GetIcon());
+  SetSecurityIcon(toolbar_model_->GetSecurityIcon());
   UpdateContentSettingsIcons();
   UpdatePageActions();
   SetInfoText();
   location_entry_->Update(contents);
   // The security level (background color) could have changed, etc.
   if (theme_provider_->UseGtkTheme()) {
     // In GTK mode, we need our parent to redraw, as it draws the text entry
     // border.
     gtk_widget_queue_draw(widget()->parent);
   } else {
@@ skipping 260 matching lines @@
 
     GdkColor border_color = theme_provider_->GetGdkColor(
         BrowserThemeProvider::COLOR_FRAME);
     gtk_util::SetRoundedWindowBorderColor(tab_to_search_box_, border_color);
 
     gtk_util::SetLabelColor(tab_to_search_full_label_, NULL);
     gtk_util::SetLabelColor(tab_to_search_partial_label_, NULL);
     gtk_util::SetLabelColor(tab_to_search_hint_leading_label_, NULL);
     gtk_util::SetLabelColor(tab_to_search_hint_trailing_label_, NULL);
     gtk_util::SetLabelColor(type_to_search_hint_, NULL);
-
-    gtk_image_set_from_stock(GTK_IMAGE(security_warning_icon_image_),
-                             GTK_STOCK_DIALOG_WARNING,
-                             GTK_ICON_SIZE_SMALL_TOOLBAR);
   } else {
     gtk_widget_modify_bg(tab_to_search_box_, GTK_STATE_NORMAL,
                          &kKeywordBackgroundColor);
     gtk_util::SetRoundedWindowBorderColor(tab_to_search_box_,
                                           kKeywordBorderColor);
 
     gtk_util::SetLabelColor(tab_to_search_full_label_, &gfx::kGdkBlack);
     gtk_util::SetLabelColor(tab_to_search_partial_label_, &gfx::kGdkBlack);
     gtk_util::SetLabelColor(tab_to_search_hint_leading_label_,
                             &kHintTextColor);
     gtk_util::SetLabelColor(tab_to_search_hint_trailing_label_,
                             &kHintTextColor);
     gtk_util::SetLabelColor(type_to_search_hint_, &kHintTextColor);
-
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    gtk_image_set_from_pixbuf(GTK_IMAGE(security_warning_icon_image_),
-                              rb.GetPixbufNamed(IDR_WARNING));
   }
 }
 
 gboolean LocationBarViewGtk::HandleExpose(GtkWidget* widget,
                                           GdkEventExpose* event) {
   GdkRectangle* alloc_rect = &hbox_->allocation;
 
   // If we're not using GTK theming, draw our own border over the edge pixels
   // of the background.
   if (!profile_ ||
@@ skipping 13 matching lines @@
     gdk_cairo_rectangle(cr, alloc_rect);
     cairo_fill(cr);
 
     // But on top of that, we also need to draw the "inner" rect, which is all
     // the color that the background should be.
     cairo_rectangle(cr, alloc_rect->x,
                     alloc_rect->y + kTopMargin + kBorderThickness,
                     alloc_rect->width,
                     alloc_rect->height - kTopMargin -
                     kBottomMargin - 2 * kBorderThickness);
-    gdk_cairo_set_source_color(cr, const_cast<GdkColor*>(
-        &kBackgroundColorByLevel[toolbar_model_->GetSchemeSecurityLevel()]));
+    gdk_cairo_set_source_color(cr, const_cast<GdkColor*>(&kBackgroundColor));
     cairo_fill(cr);
 
     cairo_destroy(cr);
   }
 
   return FALSE;  // Continue propagating the expose.
 }
 
-void LocationBarViewGtk::SetSecurityIcon(ToolbarModel::Icon icon) {
-  gtk_widget_hide(GTK_WIDGET(security_lock_icon_image_));
+void LocationBarViewGtk::SetSecurityIcon(int resource_id) {
+  gtk_widget_hide(GTK_WIDGET(ev_secure_icon_image_));
+  gtk_widget_hide(GTK_WIDGET(secure_icon_image_));
   gtk_widget_hide(GTK_WIDGET(security_warning_icon_image_));
-  if (icon != ToolbarModel::NO_ICON)
-    gtk_widget_show(GTK_WIDGET(security_icon_event_box_));
-  else
+  gtk_widget_hide(GTK_WIDGET(security_error_icon_image_));
+  if (resource_id == 0) {
     gtk_widget_hide(GTK_WIDGET(security_icon_event_box_));
-  switch (icon) {
-    case ToolbarModel::LOCK_ICON:
-      gtk_widget_show(GTK_WIDGET(security_lock_icon_image_));
+    return;
+  }
+  gtk_widget_show(GTK_WIDGET(security_icon_event_box_));
+  switch (resource_id) {
+    case IDR_EV_SECURE:
+      gtk_widget_show(GTK_WIDGET(ev_secure_icon_image_));
       break;
-    case ToolbarModel::WARNING_ICON:
+    case IDR_SECURE:
+      gtk_widget_show(GTK_WIDGET(secure_icon_image_));
+      break;
+    case IDR_SECURITY_WARNING:
       gtk_widget_show(GTK_WIDGET(security_warning_icon_image_));
       break;
-    case ToolbarModel::NO_ICON:
+    case IDR_SECURITY_ERROR:
+      gtk_widget_show(GTK_WIDGET(security_error_icon_image_));
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 void LocationBarViewGtk::SetInfoText() {
-  std::wstring info_text, info_tooltip;
-  ToolbarModel::InfoTextType info_text_type =
-      toolbar_model_->GetInfoText(&info_text, &info_tooltip);
-  if (info_text_type == ToolbarModel::INFO_EV_TEXT) {
-    gtk_widget_modify_fg(GTK_WIDGET(info_label_), GTK_STATE_NORMAL,
-                         &kEvTextColor);
-    gtk_widget_show(GTK_WIDGET(info_label_));
+  std::wstring info_text = toolbar_model_->GetSecurityInfoText();
+  if (info_text.empty()) {
+    gtk_widget_hide(GTK_WIDGET(security_info_label_));
   } else {
-    DCHECK_EQ(info_text_type, ToolbarModel::INFO_NO_INFO);
-    DCHECK(info_text.empty());
-    // Clear info_text.  Should we reset the fg here?
-    gtk_widget_hide(GTK_WIDGET(info_label_));
+    gtk_widget_modify_fg(GTK_WIDGET(security_info_label_), GTK_STATE_NORMAL,
+        toolbar_model_->GetSecurityLevel() == ToolbarModel::EV_SECURE ?
+            &kEvSecureTextColor : &kSecurityErrorTextColor);
+    gtk_widget_show(GTK_WIDGET(security_info_label_));
   }
-  gtk_label_set_text(GTK_LABEL(info_label_), WideToUTF8(info_text).c_str());
-  gtk_widget_set_tooltip_text(GTK_WIDGET(info_label_),
-                              WideToUTF8(info_tooltip).c_str());
+  gtk_label_set_text(GTK_LABEL(security_info_label_),
+                     WideToUTF8(info_text).c_str());
 }
 
 void LocationBarViewGtk::SetKeywordLabel(const std::wstring& keyword) {
   if (keyword.empty())
     return;
 
   DCHECK(profile_);
   if (!profile_->GetTemplateURLModel())
     return;
 
@@ skipping 447 matching lines @@
 
   std::string badge_text = page_action_->GetBadgeText(tab_id);
   if (badge_text.empty())
     return FALSE;
 
   gfx::CanvasPaint canvas(event, false);
   gfx::Rect bounding_rect(widget->allocation);
   page_action_->PaintBadge(&canvas, bounding_rect, tab_id);
   return FALSE;
 }