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

Index: chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc
diff --git a/chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc b/chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc
index cc2960b64a68ced712e2ee5aeb113ce4c9765c09..0385515864f91701fd09c41461ab41713820cb42 100644
--- a/chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc
+++ b/chrome/browser/ui/gtk/website_settings/website_settings_popup_gtk.cc
@@ -209,6 +209,7 @@ WebsiteSettingsPopupGtk::WebsiteSettingsPopupGtk(
       identity_contents_(NULL),
       connection_contents_(NULL),
       first_visit_contents_(NULL),
+      notebook_(NULL),
       presenter_(NULL) {
   BrowserWindowGtk* browser_window =
       BrowserWindowGtk::GetBrowserWindowForNativeWindow(parent);
@@ -306,26 +307,28 @@ void WebsiteSettingsPopupGtk::InitContents() {
                      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(
-      GTK_NOTEBOOK(notebook), permission_tab_contents, label);
+      GTK_NOTEBOOK(notebook_), permission_tab_contents, label);
+  tab_id_index_map_[TAB_ID_PERMISSIONS] = 0;
 
   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);
+  tab_id_index_map_[TAB_ID_CONNECTION] = 1;
 
-  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_);
 }
 
@@ -522,6 +525,12 @@ void WebsiteSettingsPopupGtk::SetPermissionInfo(
   gtk_widget_show_all(permissions_section_contents_);
 }
 
+void WebsiteSettingsPopupGtk::SetSelectedTab(TabId tab_id) {
+  DCHECK(notebook_);
+  gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook_),
+                                tab_id_index_map_[tab_id]);

[markusheintz_, 2012/08/21 17:07:07]

@erg: I wonder whether I'm not over complicating things here. I could just use
the tab_id and cast it. The tab ids follow the order in which the tabs are
added. Since we only have two tabs I guess we could keep things simple. WDYT?

[Elliot Glaysher, 2012/08/21 17:12:36]

I'm fine with that, but add DCHECKs to make sure that tabs do follow the order.

[markusheintz_, 2012/08/21 17:22:54]

Done. Also added a comment.

+}
+
 void WebsiteSettingsPopupGtk::OnCookiesLinkClicked(GtkWidget* widget) {
   new CollectedCookiesGtk(GTK_WINDOW(parent_),
                           tab_contents_);