Add UI notifications for admin-provided SSL certificates.

chrome/browser/ui/toolbar/toolbar_model_impl.cc

 // Copyright 2012 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/ui/toolbar/toolbar_model_impl.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
@@ skipping 17 matching lines @@
 #include "content/public/common/content_constants.h"
 #include "content/public/common/ssl_status.h"
 #include "extensions/common/constants.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
 #include "net/cert/cert_status_flags.h"
 #include "net/cert/x509_certificate.h"
 #include "ui/base/l10n/l10n_util.h"
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/policy/browser_policy_connector.h"
+#endif
+
 using content::NavigationController;
 using content::NavigationEntry;
 using content::SSLStatus;
 using content::WebContents;
 
 ToolbarModelImpl::ToolbarModelImpl(ToolbarModelDelegate* delegate)
     : delegate_(delegate),
       input_in_progress_(false) {
 }
 
@@ skipping 12 matching lines @@
   const SSLStatus& ssl = entry->GetSSL();
   switch (ssl.security_style) {
     case content::SECURITY_STYLE_UNKNOWN:
     case content::SECURITY_STYLE_UNAUTHENTICATED:
       return NONE;
 
     case content::SECURITY_STYLE_AUTHENTICATION_BROKEN:
       return SECURITY_ERROR;
 
     case content::SECURITY_STYLE_AUTHENTICATED:
+#if defined(OS_CHROMEOS)

[Peter Kasting, 2013/04/13 00:42:59]

Nit: Bonus points if browser_policy_connector can be #included by everyone and
this function just returns false on non-CrOS.  That way the caller doesn't need
to be #ifdefed.

[dconnelly, 2013/04/17 11:46:51]

Done.

+      if (policy::BrowserPolicyConnector::UsedPolicyCertificates(
+              Profile::FromBrowserContext(web_contents->GetBrowserContext()))) {

[Peter Kasting, 2013/04/13 00:42:59]

Nit: Indent 4, not 8.

No {}.

[dconnelly, 2013/04/17 11:46:51]

Done.

+        return SECURITY_POLICY_WARNING;
+      }
+#endif
       if (!!(ssl.content_status & SSLStatus::DISPLAYED_INSECURE_CONTENT))
         return SECURITY_WARNING;
       if (net::IsCertStatusError(ssl.cert_status)) {
         DCHECK(net::IsCertStatusMinorError(ssl.cert_status));
         return SECURITY_WARNING;
       }
       if ((ssl.cert_status & net::CERT_STATUS_IS_EV) &&
           content::CertStore::GetInstance()->RetrieveCert(ssl.cert_id, NULL))
         return EV_SECURE;
       return SECURE;
@@ skipping 107 matching lines @@
 }
 
 int ToolbarModelImpl::GetIcon() const {
   if (WouldReplaceSearchURLWithSearchTerms())
     return IDR_OMNIBOX_SEARCH;
   static int icon_ids[NUM_SECURITY_LEVELS] = {
     IDR_LOCATION_BAR_HTTP,
     IDR_OMNIBOX_HTTPS_VALID,
     IDR_OMNIBOX_HTTPS_VALID,
     IDR_OMNIBOX_HTTPS_WARNING,
+    IDR_OMNIBOX_HTTPS_POLICY_WARNING,
     IDR_OMNIBOX_HTTPS_INVALID,
   };
   DCHECK(arraysize(icon_ids) == NUM_SECURITY_LEVELS);
   return icon_ids[GetSecurityLevel()];
 }
 
 string16 ToolbarModelImpl::GetEVCertName() const {
   DCHECK_EQ(GetSecurityLevel(), EV_SECURE);
   scoped_refptr<net::X509Certificate> cert;
   // Note: Navigation controller and active entry are guaranteed non-NULL or
@@ skipping 54 matching lines @@
     Profile* profile =
         Profile::FromBrowserContext(contents->GetBrowserContext());
     AutocompleteClassifierFactory::GetForProfile(profile)->Classify(
         search_terms, false, false, &match, NULL);
     if (!AutocompleteMatch::IsSearchType(match.type))
       search_terms.clear();
   }
 
   return search_terms;
 }