Auto select the connection tab of the Website Settings UI in case of an https error or mixed content

chrome/browser/ui/views/website_settings/website_settings_popup_view.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/ui/views/website_settings/website_settings_popup_view.h"
 
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 295 matching lines @@
   layout->AddView(header_);
 
   layout->AddPaddingRow(1, kHeaderMarginBottom);
   tabbed_pane_ = new views::TabbedPane();
   layout->StartRow(1, content_column);
   layout->AddView(tabbed_pane_);
   // Tabs must be added after the tabbed_pane_ was added to the views
   // hierachy.  Adding the |tabbed_pane_| to the views hierachy triggers the
   // initialization of the native tab UI element. If the native tab UI
   // element is not initalized adding a tab will result in a NULL pointer
-  // excetion.
-  tabbed_pane_->AddTab(
+  // exception.
+  tabbed_pane_->AddTabAtIndex(
+      TAB_ID_PERMISSIONS,
       l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_TAB_LABEL_PERMISSIONS),
-      CreatePermissionsTab());
-  tabbed_pane_->AddTab(
+      CreatePermissionsTab(),
+      true);
+  tabbed_pane_->AddTabAtIndex(
+      TAB_ID_CONNECTION,
       l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_TAB_LABEL_CONNECTION),
-      CreateConnectionTab());
-  tabbed_pane_->SelectTabAt(0);
+      CreateConnectionTab(),
+      true);
+  DCHECK_EQ(tabbed_pane_->GetTabCount(), NUM_TAB_IDS);
   tabbed_pane_->set_listener(this);
 
   set_margins(gfx::Insets(kPopupMarginTop, kPopupMarginLeft,
                           kPopupMarginBottom, kPopupMarginRight));
 
   views::BubbleDelegateView::CreateBubble(this);
   this->Show();
   SizeToContents();
 
   presenter_.reset(new WebsiteSettings(this, profile,
@@ skipping 22 matching lines @@
   GetWidget()->Close();
 }
 
 void WebsiteSettingsPopupView::LinkClicked(views::Link* source,
                                            int event_flags) {
   if (source == cookie_dialog_link_) {
     new CollectedCookiesViews(tab_contents_);
   } else if (source == certificate_dialog_link_) {
     gfx::NativeWindow parent =
         anchor_view() ? anchor_view()->GetWidget()->GetNativeWindow() : NULL;
-ShowCertificateViewerByID(tab_contents_->web_contents(), parent, cert_id_);
+    ShowCertificateViewerByID(tab_contents_->web_contents(), parent, cert_id_);
   }
   // The popup closes automatically when the collected cookies dialog or the
   // certificate viewer opens.
 }
 
 void WebsiteSettingsPopupView::TabSelectedAt(int index) {
   tabbed_pane_->GetSelectedTab()->Layout();
   SizeToContents();
 }
 
@@ skipping 138 matching lines @@
       UTF8ToUTF16(identity_info.identity_status_description),
       certificate_dialog_link_);
 
   ResetConnectionSection(
       connection_info_content_,
       WebsiteSettingsUI::GetConnectionIcon(identity_info.connection_status),
       string16(),  // The connection section has no headline.
       UTF8ToUTF16(identity_info.connection_status_description),
       NULL);
 
-  Layout();
-  SizeToContents();
+  // TODO(markusheintz): This is a hack to resize the connection tab contents

[msw, 2012/08/24 18:56:40]

Remove this and use InvalidateLayout instead.

[markusheintz_, 2012/08/27 09:09:30]

Done.

+  // correctly. If this is not done, then the connection tab does not disaply
+  // its contents correctly in case it is selected as visible tab when the
+  // |WebsiteSettingsPopupView| is opened. Fix this.
+  int tab_index = tabbed_pane_->GetSelectedTabIndex();
+  tabbed_pane_->SelectTabAt(0);
+  tabbed_pane_->SelectTabAt(1);
+  tabbed_pane_->SelectTabAt(tab_index);
 }
 
 void WebsiteSettingsPopupView::SetFirstVisit(const string16& first_visit) {
   ResetConnectionSection(
       page_info_content_,
       WebsiteSettingsUI::GetFirstVisitIcon(first_visit),
       l10n_util::GetStringUTF16(IDS_PAGE_INFO_SITE_INFO_TITLE),
       first_visit,
       NULL);
   Layout();
   SizeToContents();
 }
 
+void WebsiteSettingsPopupView::SetSelectedTab(TabId tab_id) {
+  tabbed_pane_->SelectTabAt(tab_id);
+}
+
 views::View* WebsiteSettingsPopupView::CreatePermissionsTab() {
   views::View* pane = new views::View();
   pane->SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 1));
   // Add cookies and site data section.
   cookie_dialog_link_ = new views::Link(
       l10n_util::GetStringUTF16(IDS_WEBSITE_SETTINGS_SHOW_SITE_DATA));
   cookie_dialog_link_->set_listener(this);
   site_data_content_ = new views::View();
   views::View* site_data_section =
@@ skipping 144 matching lines @@
 
   if (link) {
     content_layout->StartRow(1, 0);
     content_layout->AddView(link);
   }
 
   layout->AddView(content_pane, 1, 1, views::GridLayout::LEADING,
                   views::GridLayout::LEADING);
   layout->AddPaddingRow(0, kConnectionSectionPaddingBottom);
 }