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

chrome/browser/ssl/ssl_manager.h

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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_SSL_SSL_MANAGER_H_
 #define CHROME_BROWSER_SSL_SSL_MANAGER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
@@ skipping 73 matching lines @@
 
   // Convenience methods for serializing/deserializing the security info.
   static std::string SerializeSecurityInfo(int cert_id,
                                            int cert_status,
                                            int security_bits);
   static bool DeserializeSecurityInfo(const std::string& state,
                                       int* cert_id,
                                       int* cert_status,
                                       int* security_bits);
 
-  // Sets |short_name| to <organization_name> [<country>] and |ca_name|
-  // to something like:
-  // "Verified by <issuer_organization_name>"
-  static bool GetEVCertNames(const net::X509Certificate& cert,
-                             std::wstring* short_name,
-                             std::wstring* ca_name);
+  // Returns "<organization_name> [<country>]".
+  static std::wstring GetEVCertName(const net::X509Certificate& cert);
 
  private:
   // SSLMessageInfo contains the information necessary for displaying a message
   // in an info-bar.
   struct SSLMessageInfo {
    public:
     explicit SSLMessageInfo(const std::wstring& text)
         : message(text),
           action(NULL) { }
 
@@ skipping 39 matching lines @@
   // for the security UI of this tab.
   NavigationController* controller_;
 
   // Handles registering notifications with the NotificationService.
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLManager);
 };
 
 #endif  // CHROME_BROWSER_SSL_SSL_MANAGER_H_