Improve the Linux Omnibox ssl background / scheme coloring.

chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc

 // Copyright (c) 2009 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 "base/gfx/gtk_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_view_gtk.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/common/notification_service.h"
 #include "googleurl/src/gurl.h"
 
 namespace {
 
 const char kTextBaseColor[] = "#808080";
 const char kSecureSchemeColor[] = "#009614";
-const char kInsecureSchemeColor[] = "#009614";
-const GdkColor kSecureBackgroundColor = GDK_COLOR_RGB(0xff, 0xf5, 0xc3);
-const GdkColor kInsecureBackgroundColor = GDK_COLOR_RGB(0xff, 0xff, 0xff);
+const char kInsecureSchemeColor[] = "#c80000";
+
+const GdkColor kBackgroundColorByLevel[] = {
+  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.
+};
 
 }  // namespace
 
 AutocompleteEditViewGtk::AutocompleteEditViewGtk(
     AutocompleteEditController* controller,
     ToolbarModel* toolbar_model,
     Profile* profile,
     CommandUpdater* command_updater)
     : tag_table_(NULL),
       text_buffer_(NULL),
@@ skipping 96 matching lines @@
 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) {
+    gtk_widget_modify_base(text_view_.get(),
+                           GTK_STATE_NORMAL,
+                           &kBackgroundColorByLevel[security_level]);
+  }
+
   if (contents) {
     RevertAll();
     // TODO(deanm): Tab switching.  The Windows code puts some state in a
     // PropertyBag on the tab contents, and restores state from there.
   } else if (visibly_changed_permanent_text) {
     RevertAll();
     // TODO(deanm): There should be code to restore select all here.
-  } else if(changed_security_level) {
+  } else if (changed_security_level) {
     EmphasizeURLComponents();
   }
 }
 
 void AutocompleteEditViewGtk::OpenURL(const GURL& url,
                                       WindowOpenDisposition disposition,
                                       PageTransition::Type transition,
                                       const GURL& alternate_nav_url,
                                       size_t selected_line,
                                       const std::wstring& keyword) {
@@ skipping 349 matching lines @@
     gtk_text_buffer_remove_all_tags(text_buffer_, &start, &end);
   }
 
   // Emphasize the scheme for security UI display purposes (if necessary).
   if (!model_->user_input_in_progress() && parts.scheme.is_nonempty() &&
       (scheme_security_level_ != ToolbarModel::NORMAL)) {
     gtk_text_buffer_get_iter_at_line_index(text_buffer_, &start, 0,
                                            parts.scheme.begin);
     gtk_text_buffer_get_iter_at_line_index(text_buffer_, &end, 0,
                                            parts.scheme.end());
-    const GdkColor* background;
     if (scheme_security_level_ == ToolbarModel::SECURE) {
-      background = &kSecureBackgroundColor;
       gtk_text_buffer_apply_tag(text_buffer_, secure_scheme_tag_,
                                 &start, &end);
     } else {
-      background = &kInsecureBackgroundColor;
       gtk_text_buffer_apply_tag(text_buffer_, insecure_scheme_tag_,
                                 &start, &end);
     }
-    gtk_widget_modify_base(text_view_.get(), GTK_STATE_NORMAL, background);
   }
 }
 
 void AutocompleteEditViewGtk::TextChanged() {
   EmphasizeURLComponents();
   controller_->OnChanged();
 }