Add tabs UI to WebsiteSettingsUI (GTK only).

chrome/browser/website_settings.cc

 // Copyright (c) 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/website_settings.h"
 
 #include <string>
 #include <vector>
 
 #include "base/string_number_conversions.h"
@@ skipping 69 matching lines @@
       site_url_(url),
       site_identity_status_(SITE_IDENTITY_STATUS_UNKNOWN),
       site_connection_status_(SITE_CONNECTION_STATUS_UNKNOWN),
       cert_store_(cert_store),
       content_settings_(profile->GetHostContentSettingsMap()) {
   ui_->SetPresenter(this);
   Init(profile, url, ssl);
   // After initialization the status about the site's connection
   // and it's identity must be available.
   DCHECK_NE(site_identity_status_, SITE_IDENTITY_STATUS_UNKNOWN);
   DCHECK_NE(site_connection_status_, SITE_CONNECTION_STATUS_UNKNOWN);

[wtc, 2012/04/23 22:01:23]

I think lines 87-90 should be moved to the new
PresentSiteIdentity() method.

[markusheintz_, 2012/04/24 08:49:41]

Done. 

I saw these as a kind of post condition check for the Init method. That was my
original motivation for leaving them here.

I plan to integrate the Init() method with the PresentSiteIdentity(). This will
group the code for connection and identity info together. There is no need to
keep two separate methods. I didn't do it in this CL to keep the CL at a
reasonable size. The overall theme of this CL was adding tabs to the UI. 

[wtc, 2012/04/24 17:14:25]

Ah, I see.  I didn't notice that.  I think you're right.
Let's move these lines back here, unless you think they
also work well as preconditions for the PresentSiteIdentity()
method.

Sorry about my confusion.

 
-  // TODO(markusheintz): Add the strings below to the grd file once a decision
-  // has been made about the exact wording.
-  std::string site_info;
-  switch (site_identity_status_) {
-    case WebsiteSettings::SITE_IDENTITY_STATUS_CERT:
-    case WebsiteSettings::SITE_IDENTITY_STATUS_DNSSEC_CERT:
-      site_info = "Identity verified";
-      break;
-    case WebsiteSettings::SITE_IDENTITY_STATUS_EV_CERT:
-      site_info = UTF16ToUTF8(organization_name());
-      site_info += " - Identity verified";
-      break;
-    default:
-      site_info = "Identity not verified";
-      break;
-  }
-  ui_->SetSiteInfo(site_info);
-
   PresentSitePermissions();
   PresentSiteData();
+  PresentSiteIdentity();
 }
 
 WebsiteSettings::~WebsiteSettings() {
 }
 
 void WebsiteSettings::OnUIClosing() {
   ui_->SetPresenter(NULL);
   delete this;
 }
 
@@ skipping 316 matching lines @@
   cookie_info.cookie_source = site_url_.host();
   cookie_info.allowed = GetLocalStoredObjectCount(
       tab_specific_content_settings()->allowed_local_shared_objects());
   cookie_info.blocked = GetLocalStoredObjectCount(
       tab_specific_content_settings()->blocked_local_shared_objects());
   cookie_info_list.push_back(cookie_info);
 
   ui_->SetCookieInfo(cookie_info_list);
 }
 
+void WebsiteSettings::PresentSiteIdentity() {
+  WebsiteSettingsUI::IdentityInfo info;
+  if (site_identity_status_ == SITE_IDENTITY_STATUS_EV_CERT)
+    info.site_identity = UTF16ToUTF8(organization_name());
+  else
+    info.site_identity = site_url_.host();
+
+  info.connection_status = site_connection_status_;
+  info.connection_status_description =
+      UTF16ToUTF8(site_connection_details_);
+  info.identity_status = site_identity_status_;
+  info.identity_status_description =
+      UTF16ToUTF8(site_identity_details_);
+  ui_->SetIdentityInfo(info);
+}
+
 // static
 void WebsiteSettings::Show(gfx::NativeWindow parent,
                            Profile* profile,
                            TabContentsWrapper* tab_contents_wrapper,
                            const GURL& url,
                            const content::SSLStatus& ssl) {
 #if defined(TOOLKIT_GTK)
   // The WebsiteSettingsModel will delete itself after the UI is closed.
   new WebsiteSettings(new WebsiteSettingsPopupGtk(parent,
                                                   profile,
                                                   tab_contents_wrapper),
                       profile,
                       tab_contents_wrapper->content_settings(),
                       url,
                       ssl,
                       content::CertStore::GetInstance());
 #endif
 }