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

chrome/browser/gtk/location_bar_view_gtk.h

 // 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.
 
 #ifndef CHROME_BROWSER_GTK_LOCATION_BAR_VIEW_GTK_H_
 #define CHROME_BROWSER_GTK_LOCATION_BAR_VIEW_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include <map>
@@ skipping 102 matching lines @@
   virtual int PageActionVisibleCount();
   virtual ExtensionAction* GetPageAction(size_t index);
   virtual ExtensionAction* GetVisiblePageAction(size_t index);
   virtual void TestPageActionPressed(size_t index);
 
   // Implement the NotificationObserver interface.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
-  // Translation between a security level and the background color.  Both the
-  // location bar and edit have to manage and match the background color.
-  static const GdkColor kBackgroundColorByLevel[3];
+  // Edit background color.
+  static const GdkColor kBackgroundColor;
 
  private:
   class ContentSettingImageViewGtk : public InfoBubbleGtkDelegate {
    public:
     ContentSettingImageViewGtk(ContentSettingsType content_type,
                                const LocationBarViewGtk* parent,
                                Profile* profile);
     virtual ~ContentSettingImageViewGtk();
 
     GtkWidget* widget() { return event_box_.get(); }
@@ skipping 133 matching lines @@
         HandleExpose(widget, event);
   }
 
   gboolean HandleExpose(GtkWidget* widget, GdkEventExpose* event);
 
   static gboolean OnSecurityIconPressed(GtkWidget* sender,
                                         GdkEventButton* event,
                                         LocationBarViewGtk* location_bar);
 
   // Set the SSL icon we should be showing.
-  void SetSecurityIcon(ToolbarModel::Icon icon);
+  void SetSecurityIcon(int resource_id);
 
   // Sets the text that should be displayed in the info label and its associated
   // tooltip text.  Call with an empty string if the info label should be
   // hidden.
   void SetInfoText();
 
   // Set the keyword text for the Search BLAH: keyword box.
   void SetKeywordLabel(const std::wstring& keyword);
 
   // Set the keyword text for the "Press tab to search BLAH" hint box.
@@ skipping 11 matching lines @@
 
   // Show or hide |tab_to_search_box_|, |tab_to_search_hint_| and
   // |type_to_search_hint_| according to the value of |show_selected_keyword_|,
   // |show_keyword_hint_|, |show_search_hint_| and the available horizontal
   // space in the location bar.
   void AdjustChildrenVisibility();
 
   // The outermost widget we want to be hosted.
   OwnedWidgetGtk hbox_;
 
-  // SSL icons.
+  // SSL state.
   GtkWidget* security_icon_event_box_;
-  GtkWidget* security_lock_icon_image_;
+  GtkWidget* ev_secure_icon_image_;
+  GtkWidget* secure_icon_image_;
   GtkWidget* security_warning_icon_image_;
-  // Toolbar info text (EV cert info).
-  GtkWidget* info_label_;
+  GtkWidget* security_error_icon_image_;
+  GtkWidget* security_info_label_;
 
   // Content setting icons.
   OwnedWidgetGtk content_setting_hbox_;
   ScopedVector<ContentSettingImageViewGtk> content_setting_views_;
 
   // Extension page action icons.
   OwnedWidgetGtk page_action_hbox_;
   ScopedVector<PageActionViewGtk> page_action_views_;
 
   // Area on the left shown when in tab to search mode.
@@ skipping 53 matching lines @@
   // Indicate if |tab_to_search_hint_| should be shown.
   bool show_keyword_hint_;
 
   // Indicate if |type_to_search_hint_| should be shown.
   bool show_search_hint_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk);
 };
 
 #endif  // CHROME_BROWSER_GTK_LOCATION_BAR_VIEW_GTK_H_