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

chrome/browser/gtk/browser_toolbar_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/browser_toolbar_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <X11/XF86keysym.h>
 
@@ skipping 51 matching lines @@
 
 // Exterior padding on left/right of toolbar.
 const int kLeftRightPadding = 2;
 
 // Height of the toolbar in pixels when we only show the location bar.
 const int kToolbarHeightLocationBarOnly = kToolbarHeight - 2;
 
 // Interior spacing between toolbar widgets.
 const int kToolbarWidgetSpacing = 4;
 
-// The color used as the base[] color of the location entry during a secure
-// connection.
-const GdkColor kSecureColor = GDK_COLOR_RGB(255, 245, 195);
-
 }  // namespace
 
 // BrowserToolbarGtk, public ---------------------------------------------------
 
 BrowserToolbarGtk::BrowserToolbarGtk(Browser* browser, BrowserWindowGtk* window)
     : toolbar_(NULL),
       location_bar_(new LocationBarViewGtk(this, browser)),
       model_(browser->toolbar_model()),
       page_menu_model_(this, browser),
       app_menu_model_(this, browser),
@@ skipping 503 matching lines @@
       right = star_->widget();
     }
 
     GdkRectangle rec = {
       left->allocation.x,
       left->allocation.y,
       (right->allocation.x - left->allocation.x) + right->allocation.width,
       (right->allocation.y - left->allocation.y) + right->allocation.height
     };
 
-    // Make sure our off screen entry has the correct base color if we're in
-    // secure mode.
-    gtk_widget_modify_base(
-        offscreen_entry_.get(), GTK_STATE_NORMAL,
-        (browser_->toolbar_model()->GetSchemeSecurityLevel() ==
-         ToolbarModel::SECURE) ?
-        &kSecureColor : NULL);
-
     gtk_util::DrawTextEntryBackground(offscreen_entry_.get(),
                                       location_hbox, &e->area,
                                       &rec);
   }
 
   return FALSE;
 }
 
 void BrowserToolbarGtk::OnButtonClick(GtkWidget* button) {
   if ((button == back_->widget()) ||
@@ skipping 100 matching lines @@
   menu->PopupAsFromKeyEvent(button);
   menu_bar_helper_.MenuStartedShowing(button, menu->widget());
 }
 
 void BrowserToolbarGtk::PopupForButtonNextTo(GtkWidget* button,
                                              GtkMenuDirectionType dir) {
   GtkWidget* other_button = button == page_menu_button_.get() ?
       app_menu_button_.get() : page_menu_button_.get();
   PopupForButton(other_button);
 }