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

chrome/browser/autocomplete/autocomplete_edit_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/autocomplete/autocomplete_edit_view_gtk.h"
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
 #include <algorithm>
@@ skipping 25 matching lines @@
 #include "chrome/browser/views/location_bar_view.h"
 #include "gfx/skia_utils_gtk.h"
 #else
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/gtk/location_bar_view_gtk.h"
 #endif
 
 namespace {
 
 const char kTextBaseColor[] = "#808080";
-const char kSecureSchemeColor[] = "#009614";
-const char kInsecureSchemeColor[] = "#c80000";
+const char kEVSecureSchemeColor[] = "#079500";
+const char kSecureSchemeColor[] = "#000e95";
+const char kSecurityErrorSchemeColor[] = "#a20000";
 
-const double kStrikethroughStrokeRed = 210.0 / 256.0;
+const double kStrikethroughStrokeRed = 162.0 / 256.0;
 const double kStrikethroughStrokeWidth = 2.0;
 
 size_t GetUTF8Offset(const std::wstring& wide_text, size_t wide_text_offset) {
   return WideToUTF8(wide_text.substr(0, wide_text_offset)).size();
 }
 
 // Stores GTK+-specific state so it can be restored after switching tabs.
 struct ViewState {
   explicit ViewState(const AutocompleteEditViewGtk::CharRange& selection_range)
       : selection_range(selection_range) {
@@ skipping 51 matching lines @@
     AutocompleteEditController* controller,
     ToolbarModel* toolbar_model,
     Profile* profile,
     CommandUpdater* command_updater,
     bool popup_window_mode,
     const BubblePositioner* bubble_positioner)
     : text_view_(NULL),
       tag_table_(NULL),
       text_buffer_(NULL),
       faded_text_tag_(NULL),
+      ev_secure_scheme_tag_(NULL),
       secure_scheme_tag_(NULL),
-      insecure_scheme_tag_(NULL),
+      security_error_scheme_tag_(NULL),
       model_(new AutocompleteEditModel(this, controller, profile)),
       popup_view_(AutocompletePopupView::CreatePopupView(gfx::Font(), this,
                                                          model_.get(),
                                                          profile,
                                                          bubble_positioner)),
       controller_(controller),
       toolbar_model_(toolbar_model),
       command_updater_(command_updater),
       popup_window_mode_(popup_window_mode),
-      scheme_security_level_(ToolbarModel::NORMAL),
+      security_level_(ToolbarModel::NONE),
       mark_set_handler_id_(0),
 #if defined(OS_CHROMEOS)
       button_1_pressed_(false),
       text_selected_during_click_(false),
       text_view_focused_before_button_press_(false),
 #endif
 #if !defined(TOOLKIT_VIEWS)
       theme_provider_(GtkThemeProvider::GetFrom(profile)),
 #endif
       enter_was_pressed_(false),
@@ skipping 60 matching lines @@
   gtk_container_add(GTK_CONTAINER(alignment_.get()), text_view_);
 
   // Do not allow inserting tab characters when pressing Tab key, so that when
   // Tab key is pressed, |text_view_| will emit "move-focus" signal, which will
   // be intercepted by our own handler to trigger Tab to search feature when
   // necessary.
   gtk_text_view_set_accepts_tab(GTK_TEXT_VIEW(text_view_), FALSE);
 
   faded_text_tag_ = gtk_text_buffer_create_tag(text_buffer_,
       NULL, "foreground", kTextBaseColor, NULL);
+  ev_secure_scheme_tag_ = gtk_text_buffer_create_tag(text_buffer_,
+      NULL, "foreground", kEVSecureSchemeColor, NULL);
   secure_scheme_tag_ = gtk_text_buffer_create_tag(text_buffer_,
       NULL, "foreground", kSecureSchemeColor, NULL);
-  insecure_scheme_tag_ = gtk_text_buffer_create_tag(text_buffer_,
-      NULL, "foreground", kInsecureSchemeColor, NULL);
+  security_error_scheme_tag_ = gtk_text_buffer_create_tag(text_buffer_,
+      NULL, "foreground", kSecurityErrorSchemeColor, NULL);
   normal_text_tag_ = gtk_text_buffer_create_tag(text_buffer_,
       NULL, "foreground", "#000000", NULL);
 
   // NOTE: This code used to connect to "changed", however this was fired too
   // often and during bad times (our own buffer changes?).  It works out much
   // better to listen to end-user-action, which should be fired whenever the
   // user makes some sort of change to the buffer.
   g_signal_connect(text_buffer_, "begin-user-action",
                    G_CALLBACK(&HandleBeginUserActionThunk), this);
   g_signal_connect(text_buffer_, "end-user-action",
@@ skipping 47 matching lines @@
   registrar_.Add(this,
                  NotificationType::BROWSER_THEME_CHANGED,
                  NotificationService::AllSources());
   theme_provider_->InitThemesFor(this);
 #else
   // Manually invoke SetBaseColor() because TOOLKIT_VIEWS doesn't observe
   // themes.
   SetBaseColor();
 #endif
 
-  ViewIDUtil::SetID(widget(), VIEW_ID_AUTOCOMPLETE);
+  ViewIDUtil::SetID(GetNativeView(), VIEW_ID_AUTOCOMPLETE);
 }
 
 void AutocompleteEditViewGtk::SetFocus() {
   gtk_widget_grab_focus(text_view_);
 }
 
 int AutocompleteEditViewGtk::TextWidth() {
   int horizontal_border_size =
       gtk_text_view_get_border_window_size(GTK_TEXT_VIEW(text_view_),
                                            GTK_TEXT_WINDOW_LEFT) +
@@ skipping 29 matching lines @@
       tab->property_bag(),
       AutocompleteEditState(model_state, ViewState(GetSelection())));
 }
 
 void AutocompleteEditViewGtk::Update(const TabContents* contents) {
   // NOTE: We're getting the URL text here from the ToolbarModel.
   bool visibly_changed_permanent_text =
       model_->UpdatePermanentText(toolbar_model_->GetText());
 
   ToolbarModel::SecurityLevel security_level =
-        toolbar_model_->GetSchemeSecurityLevel();
-  bool changed_security_level = (security_level != scheme_security_level_);
-  scheme_security_level_ = security_level;
-
-  // TODO(deanm): This doesn't exactly match Windows.  There there is a member
-  // background_color_.  I think we can get away with just the level though.
-  if (changed_security_level) {
-    SetBaseColor();
-  }
+        toolbar_model_->GetSecurityLevel();
+  bool changed_security_level = (security_level != security_level_);
+  security_level_ = security_level;
 
   if (contents) {
     selected_text_.clear();
     RevertAll();
     const AutocompleteEditState* state =
         GetStateAccessor()->GetProperty(contents->property_bag());
     if (state) {
       model_->RestoreState(state->model_state);
 
       // Move the marks for the cursor and the other end of the selection to
@@ skipping 219 matching lines @@
   SetBaseColor();
 }
 
 void AutocompleteEditViewGtk::SetBaseColor() {
 #if defined(TOOLKIT_VIEWS)
   bool use_gtk = false;
 #else
   bool use_gtk = theme_provider_->UseGtkTheme();
 #endif
 
-  // If we're on a secure connection, ignore what the theme wants us to do
-  // and use a yellow background.
-  bool is_secure = (scheme_security_level_ == ToolbarModel::SECURE);
-  if (use_gtk && !is_secure) {
+  if (use_gtk) {
     gtk_widget_modify_base(text_view_, GTK_STATE_NORMAL, NULL);
 
     // Grab the text colors out of the style and set our tags to use them.
     GtkStyle* style = gtk_rc_get_style(text_view_);
 
     // style may be unrealized at this point, so calculate the halfway point
     // between text[] and base[] manually instead of just using text_aa[].
     GdkColor average_color = gtk_util::AverageColors(
         style->text[GTK_STATE_NORMAL], style->base[GTK_STATE_NORMAL]);
 
-    g_object_set(faded_text_tag_, "foreground-gdk",
-                 &average_color, NULL);
+    g_object_set(faded_text_tag_, "foreground-gdk", &average_color, NULL);
     g_object_set(normal_text_tag_, "foreground-gdk",
                  &style->text[GTK_STATE_NORMAL], NULL);
   } else {
+    const GdkColor* background_color_ptr;
 #if defined(TOOLKIT_VIEWS)
     const GdkColor background_color = gfx::SkColorToGdkColor(
-        LocationBarView::GetColor(is_secure, LocationBarView::BACKGROUND));
-    gtk_widget_modify_base(text_view_, GTK_STATE_NORMAL,
-        &background_color);
+        LocationBarView::GetColor(ToolbarModel::NONE,
+                                  LocationBarView::BACKGROUND));
+    background_color_ptr = &background_color;
 #else
-    gtk_widget_modify_base(text_view_, GTK_STATE_NORMAL,
-        &LocationBarViewGtk::kBackgroundColorByLevel[scheme_security_level_]);
+    background_color_ptr = &LocationBarViewGtk::kBackgroundColor;
 #endif
+    gtk_widget_modify_base(text_view_, GTK_STATE_NORMAL, background_color_ptr);
 
     g_object_set(faded_text_tag_, "foreground", kTextBaseColor, NULL);
     g_object_set(normal_text_tag_, "foreground", "#000000", NULL);
   }
 }
 
 void AutocompleteEditViewGtk::HandleBeginUserAction() {
   OnBeforePossibleChange();
 }
 
@@ skipping 715 matching lines @@
                                                          host.end()));
 
     gtk_text_buffer_apply_tag(text_buffer_, normal_text_tag_, &start, &end);
   } else {
     gtk_text_buffer_apply_tag(text_buffer_, normal_text_tag_, &start, &end);
   }
 
   strikethrough_ = CharRange();
   // Emphasize the scheme for security UI display purposes (if necessary).
   if (!model_->user_input_in_progress() && scheme.is_nonempty() &&
-      (scheme_security_level_ != ToolbarModel::NORMAL)) {
+      (security_level_ != ToolbarModel::NONE)) {
     CharRange scheme_range = CharRange(GetUTF8Offset(text, scheme.begin),
                                        GetUTF8Offset(text, scheme.end()));
     ItersFromCharRange(scheme_range, &start, &end);
 
-    if (scheme_security_level_ == ToolbarModel::SECURE) {
-      gtk_text_buffer_apply_tag(text_buffer_, secure_scheme_tag_,
-                                &start, &end);
-    } else {
+    if (security_level_ == ToolbarModel::SECURITY_ERROR) {
       strikethrough_ = scheme_range;
       // When we draw the strikethrough, we don't want to include the ':' at the
       // end of the scheme.
       strikethrough_.cp_max--;
 
-      gtk_text_buffer_apply_tag(text_buffer_, insecure_scheme_tag_,
+      gtk_text_buffer_apply_tag(text_buffer_, security_error_scheme_tag_,
                                 &start, &end);
+    } else {
+      gtk_text_buffer_apply_tag(text_buffer_,
+          (security_level_ == ToolbarModel::EV_SECURE) ?
+              ev_secure_scheme_tag_ : secure_scheme_tag_, &start, &end);
     }
   }
 }
 
 void AutocompleteEditViewGtk::TextChanged() {
   EmphasizeURLComponents();
   controller_->OnChanged();
 }
 
 void AutocompleteEditViewGtk::SavePrimarySelection(
@@ skipping 50 matching lines @@
 
   PangoDirection dir = PANGO_DIRECTION_NEUTRAL;
   do {
     dir = pango_unichar_direction(gtk_text_iter_get_char(&iter));
     if (dir != PANGO_DIRECTION_NEUTRAL)
       break;
   } while (gtk_text_iter_forward_char(&iter));
 
   return dir;
 }