Display the SECURITY_WARNING status in the location bar for the

ERR_CERT_UNABLE_TO_CHECK_REVOCATION certificate error. Do not 
display an info bar.

Remove the unused ToolbarModel::GetIconHoverText function.

Note: chrome/app/generated_resources.grd was removed from the
changelist to avoid unit_tests failures on the Windows buildbots.

Originial review URL: http://codereview.chromium.org/1653003

R=pkasting,jcivelli
BUG=27125
TEST=Visit port 452 on the chrometws server.
Review URL: http://codereview.chromium.org/1594033

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44678 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 9 deletions

diff --git a/chrome/browser/toolbar_model.h b/chrome/browser/toolbar_model.h
index 865d39d..96a48e5 100644
--- a/chrome/browser/toolbar_model.h
+++ b/chrome/browser/toolbar_model.h
@@ -18,11 +18,15 @@ class NavigationEntry;
 // from the navigation controller returned by GetNavigationController().
 class ToolbarModel {
  public:
+  // TODO(wtc): unify ToolbarModel::SecurityLevel with SecurityStyle.  We
+  // don't need two sets of security UI levels.  SECURITY_STYLE_AUTHENTICATED
+  // needs to be refined into three levels: warning, standard, and EV.
   enum SecurityLevel {
     NONE = 0,          // HTTP/no URL/user is editing
     EV_SECURE,         // HTTPS with valid EV cert
     SECURE,            // HTTPS (non-EV)
-    SECURITY_WARNING,  // HTTPS, but with mixed content on the page
+    SECURITY_WARNING,  // HTTPS, but unable to check certificate revocation
+                       // status or with mixed content on the page
     SECURITY_ERROR,    // Attempted HTTPS and failed, page not authenticated
     NUM_SECURITY_LEVELS,
   };
@@ -41,10 +45,6 @@ class ToolbarModel {
   // user is editing; see AutocompleteEditView::GetIcon().
   int GetIcon() const;
 
-  // Sets the text displayed in the info bubble that appears when the user
-  // hovers the mouse over the icon.
-  void GetIconHoverText(std::wstring* text) const;
-
   // Returns the text, if any, that should be displayed on the right of the
   // location bar.
   std::wstring GetSecurityInfoText() const;
@@ -60,10 +60,6 @@ class ToolbarModel {
   // If this returns NULL, default values are used.
   NavigationController* GetNavigationController() const;
 
-  // Builds a short error message from the SSL status code found in |entry|.
-  // The message is set in |text|.
-  void CreateErrorText(NavigationEntry* entry, std::wstring* text) const;
-
   Browser* browser_;
 
   // Whether the text in the location bar is currently being edited.