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

chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.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/gtk/website_settings/website_settings_popup_gtk.h"
 
 #include "base/i18n/rtl.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
@@ skipping 198 matching lines @@
       profile_(profile),
       tab_contents_(tab_contents),
       browser_(NULL),
       cert_id_(0),
       header_box_(NULL),
       cookies_section_contents_(NULL),
       permissions_section_contents_(NULL),
       identity_contents_(NULL),
       connection_contents_(NULL),
       first_visit_contents_(NULL),
+      notebook_(NULL),
       presenter_(NULL) {
   BrowserWindowGtk* browser_window =
       BrowserWindowGtk::GetBrowserWindowForNativeWindow(parent);
   browser_ = browser_window->browser();
   anchor_ = browser_window->
       GetToolbar()->GetLocationBarView()->location_icon_widget();
 
   InitContents();
 
   BubbleGtk::ArrowLocationGtk arrow_location = base::i18n::IsRTL() ?
@@ skipping 77 matching lines @@
   connection_contents_ = gtk_vbox_new(FALSE, ui::kControlSpacing);
   gtk_box_pack_start(GTK_BOX(connection_tab), connection_contents_, FALSE,
                      FALSE, 0);
   gtk_box_pack_start(GTK_BOX(connection_tab), gtk_hseparator_new(), FALSE,
                      FALSE, 0);
   first_visit_contents_ = gtk_vbox_new(FALSE, ui::kControlSpacing);
   gtk_box_pack_start(GTK_BOX(connection_tab), first_visit_contents_, FALSE,
                      FALSE, 0);
 
   // Create tab container and add all tabs.
-  GtkWidget* notebook = gtk_notebook_new();
+  notebook_ = gtk_notebook_new();
   if (theme_service_->UsingNativeTheme())
-    gtk_widget_modify_bg(notebook, GTK_STATE_NORMAL, NULL);
+    gtk_widget_modify_bg(notebook_, GTK_STATE_NORMAL, NULL);
   else
-    gtk_widget_modify_bg(notebook, GTK_STATE_NORMAL, &kBackgroundColor);
+    gtk_widget_modify_bg(notebook_, GTK_STATE_NORMAL, &kBackgroundColor);
 
   GtkWidget* label = theme_service_->BuildLabel(
       l10n_util::GetStringUTF8(IDS_WEBSITE_SETTINGS_TAB_LABEL_PERMISSIONS),
       ui::kGdkBlack);
   gtk_widget_show(label);
   gtk_notebook_append_page(

[msw, 2012/08/23 21:26:39]

s/gtk_notebook_append_page/gtk_notebook_insert_page/ with enum values for the
indices, here and line 334.

[markusheintz_, 2012/08/23 22:21:34]

Done.

-      GTK_NOTEBOOK(notebook), permission_tab_contents, label);
+      GTK_NOTEBOOK(notebook_), permission_tab_contents, label);
 
   label = theme_service_->BuildLabel(
       l10n_util::GetStringUTF8(IDS_WEBSITE_SETTINGS_TAB_LABEL_CONNECTION),
       ui::kGdkBlack);
   gtk_widget_show(label);
-  gtk_notebook_append_page(GTK_NOTEBOOK(notebook), connection_tab, label);
+  gtk_notebook_append_page(GTK_NOTEBOOK(notebook_), connection_tab, label);
 
-  gtk_box_pack_start(GTK_BOX(contents_), notebook, FALSE, FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(contents_), notebook_, FALSE, FALSE, 0);
   gtk_widget_show_all(contents_);
 }
 
 void WebsiteSettingsPopupGtk::OnPermissionChanged(
     PermissionSelector* selector) {
   presenter_->OnSitePermissionChanged(selector->type(),
                                       selector->setting());
 }
 
 void WebsiteSettingsPopupGtk::OnComboboxShown() {
@@ skipping 189 matching lines @@
     selector->AddObserver(this);
     GtkWidget* hbox = selector->CreateUI();
     selectors_.push_back(selector);
     gtk_box_pack_start(GTK_BOX(permissions_section_contents_), hbox, FALSE,
                        FALSE, 0);
   }
 
   gtk_widget_show_all(permissions_section_contents_);
 }
 
+void WebsiteSettingsPopupGtk::SetSelectedTab(TabId tab_id) {
+  DCHECK(notebook_);
+  // The |TabID|s correspond to the indicies used by the notebook widget.
+  // Therefore |tab_id| can be used directly for setting the current page of
+  // the |notebook_|.
+  DCHECK_EQ(TAB_ID_PERMISSIONS, 0);

[msw, 2012/08/23 21:26:39]

Remove these two DCHECKs.

[markusheintz_, 2012/08/23 22:21:34]

Done.

+  DCHECK_EQ(TAB_ID_CONNECTION, 1);
+  gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook_),
+                                static_cast<gint>(tab_id));
+}
+
 void WebsiteSettingsPopupGtk::OnCookiesLinkClicked(GtkWidget* widget) {
   new CollectedCookiesGtk(GTK_WINDOW(parent_),
                           tab_contents_);
   bubble_->Close();
 }
 
 void WebsiteSettingsPopupGtk::OnViewCertLinkClicked(GtkWidget* widget) {
   DCHECK_NE(cert_id_, 0);
   ShowCertificateViewerByID(
       tab_contents_->web_contents(), GTK_WINDOW(parent_), cert_id_);
   bubble_->Close();
 }
 
 void WebsiteSettingsPopupGtk::OnCloseButtonClicked(GtkWidget* widget) {
   bubble_->Close();
 }