Revert 57311 - Part 2 of the SSL InfoBubble....

chrome/browser/page_info_model.cc

 // 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.
 
 #include "chrome/browser/page_info_model.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "base/callback.h"
@@ skipping 81 matching lines @@
   } else {
     // HTTP or bad HTTPS.
     description.assign(l10n_util::GetStringUTF16(
         IDS_PAGE_INFO_SECURITY_TAB_INSECURE_IDENTITY));
     state = false;
   }
   sections_.push_back(SectionInfo(
       state,
       l10n_util::GetStringUTF16(IDS_PAGE_INFO_SECURITY_TAB_IDENTITY_TITLE),
       head_line,
-      description,
-      SECTION_INFO_IDENTITY));
+      description));
 
   // Connection section.
   // We consider anything less than 80 bits encryption to be weak encryption.
   // TODO(wtc): Bug 1198735: report mixed/unsafe content for unencrypted and
   // weakly encrypted connections.
   state = true;
   head_line.clear();
   description.clear();
   if (ssl.security_bits() <= 0) {
     state = false;
@@ skipping 19 matching lines @@
               IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_INSECURE_CONTENT_ERROR :
               IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_INSECURE_CONTENT_WARNING)));
     }
   }
 
   uint16 cipher_suite =
       net::SSLConnectionStatusToCipherSuite(ssl.connection_status());
   if (ssl.security_bits() > 0 && cipher_suite) {
     bool did_fallback = (ssl.connection_status() &
                          net::SSL_CONNECTION_SSL3_FALLBACK) != 0;
-    bool no_renegotiation =
-        (ssl.connection_status() &
-        net::SSL_CONNECTION_NO_RENEGOTIATION_EXTENSION) != 0;
+    bool no_renegotiation = (ssl.connection_status() &
+                             net::SSL_CONNECTION_NO_RENEGOTIATION_EXTENSION) != 0;
     const char *key_exchange, *cipher, *mac;
     net::SSLCipherSuiteToStrings(&key_exchange, &cipher, &mac, cipher_suite);
 
     description += ASCIIToUTF16("\n\n");
     description += l10n_util::GetStringFUTF16(
         IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTION_DETAILS,
         ASCIIToUTF16(cipher), ASCIIToUTF16(mac), ASCIIToUTF16(key_exchange));
 
     description += ASCIIToUTF16("\n\n");
     uint8 compression_id =
@@ skipping 20 matching lines @@
       description += ASCIIToUTF16("\n\n");
       description += l10n_util::GetStringUTF16(
           IDS_PAGE_INFO_SECURITY_TAB_RENEGOTIATION_MESSAGE);
     }
   }
 
   sections_.push_back(SectionInfo(
       state,
       l10n_util::GetStringUTF16(IDS_PAGE_INFO_SECURITY_TAB_CONNECTION_TITLE),
       head_line,
-      description,
-      SECTION_INFO_CONNECTION));
+      description));
 
   // Request the number of visits.
   HistoryService* history = profile->GetHistoryService(
       Profile::EXPLICIT_ACCESS);
   if (show_history && history) {
     history->GetVisitCountToHost(
         url,
         &request_consumer_,
         NewCallback(this, &PageInfoModel::OnGotVisitCountToHost));
   }
@@ skipping 24 matching lines @@
     visited_before_today = (first_visit_midnight < today);
   }
 
   if (!visited_before_today) {
     sections_.push_back(SectionInfo(
         false,
         l10n_util::GetStringUTF16(
             IDS_PAGE_INFO_SECURITY_TAB_PERSONAL_HISTORY_TITLE),
         string16(),
         l10n_util::GetStringUTF16(
-            IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY),
-        SECTION_INFO_FIRST_VISIT));
+            IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY)));
   } else {
     sections_.push_back(SectionInfo(
         true,
         l10n_util::GetStringUTF16(
             IDS_PAGE_INFO_SECURITY_TAB_PERSONAL_HISTORY_TITLE),
         string16(),
         l10n_util::GetStringFUTF16(
             IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY,
-            WideToUTF16(base::TimeFormatShortDate(first_visit))),
-        SECTION_INFO_FIRST_VISIT));
+            WideToUTF16(base::TimeFormatShortDate(first_visit)))));
   }
   observer_->ModelChanged();
 }
 
 // static
 void PageInfoModel::RegisterPrefs(PrefService* prefs) {
   prefs->RegisterDictionaryPref(prefs::kPageInfoWindowPlacement);
 }