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

chrome/browser/cocoa/location_bar_view_mac.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_COCOA_LOCATION_BAR_VIEW_MAC_H_
 #define CHROME_BROWSER_COCOA_LOCATION_BAR_VIEW_MAC_H_
 
 #include <string>
 #include <map>
 #include <vector>
@@ skipping 159 matching lines @@
 
     bool visible_;
 
     DISALLOW_COPY_AND_ASSIGN(LocationBarImageView);
   };
 
   // SecurityImageView is used to display the lock or warning icon when the
   // current URL's scheme is https.
   class SecurityImageView : public LocationBarImageView {
    public:
-    enum Image {
-      LOCK = 0,
-      WARNING
-    };
-
     SecurityImageView(LocationBarViewMac* owner,
                       Profile* profile,
                       ToolbarModel* model);
     virtual ~SecurityImageView();
 
     // Sets the image to the appropriate icon.
-    void SetImageShown(Image image);
+    void SetImageShown(int resource_id);
 
     // Shows the page info dialog.
     virtual void OnMousePressed(NSRect bounds);
 
    private:
-    // The lock icon shown when using HTTPS. Loaded lazily, the first time it's
-    // needed.
-    scoped_nsobject<NSImage> lock_icon_;
-
-    // The warning icon shown when HTTPS is broken. Loaded lazily, the first
-    // time it's needed.
-    scoped_nsobject<NSImage> warning_icon_;
+    // Icons for various states.  Lazily loaded the first time they're needed.
+    scoped_nsobject<NSImage> ev_secure_icon_;
+    scoped_nsobject<NSImage> secure_icon_;
+    scoped_nsobject<NSImage> security_warning_icon_;
+    scoped_nsobject<NSImage> security_error_icon_;
 
     // The location bar view that owns us.
     LocationBarViewMac* owner_;
 
     Profile* profile_;
     ToolbarModel* model_;
 
     DISALLOW_COPY_AND_ASSIGN(SecurityImageView);
   };
 
@@ skipping 161 matching lines @@
     LocationBarViewMac* owner_;
 
     Profile* profile_;
     ToolbarModel* toolbar_model_;
 
     DISALLOW_COPY_AND_ASSIGN(PageActionViewList);
   };
 
  private:
   // Sets the SSL icon we should be showing.
-  void SetSecurityIcon(ToolbarModel::Icon icon);
+  void SetSecurityIcon(int resource_id);
 
   // Sets the label for the SSL icon.
   void SetSecurityIconLabel();
 
   // Posts |notification| to the default notification center.
   void PostNotification(const NSString* notification);
 
   // Updates visibility of the content settings icons based on the current
   // tab contents state.
   void RefreshContentSettingsViews();
@@ skipping 33 matching lines @@
   // The transition type to use for the navigation.
   PageTransition::Type transition_;
 
   // Used to register for notifications received by NotificationObserver.
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);
 };
 
 #endif  // CHROME_BROWSER_COCOA_LOCATION_BAR_VIEW_MAC_H_