Add Geolocation to the content types. This adds several special case guards s...

chrome/browser/gtk/options/content_settings_window_gtk.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/gtk/options/content_settings_window_gtk.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
@@ skipping 96 matching lines @@
       gtk_label_new(
           l10n_util::GetStringUTF8(IDS_PLUGIN_TAB_LABEL).c_str()));
   gtk_notebook_append_page(
       GTK_NOTEBOOK(notebook_),
       popup_page_.get_page_widget(),
       gtk_label_new(
           l10n_util::GetStringUTF8(IDS_POPUP_TAB_LABEL).c_str()));
 
   gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog_)->vbox), notebook_);
 
+  // TODO(joth): remove -1 when geolocation tab is added.
   DCHECK_EQ(gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook_)),
-            CONTENT_SETTINGS_NUM_TYPES);
+            CONTENT_SETTINGS_NUM_TYPES - 1);
 
   // Need to show the notebook before connecting switch-page signal, otherwise
   // we'll immediately get a signal switching to page 0 and overwrite our
   // last_selected_page_ value.
   gtk_widget_show_all(dialog_);
 
   g_signal_connect(notebook_, "switch-page",
                    G_CALLBACK(OnSwitchPageThunk), this);
 
   // We only have one button and don't do any special handling, so just hook it
@@ skipping 38 matching lines @@
   int index = page_num;
   DCHECK(index > CONTENT_SETTINGS_TYPE_DEFAULT &&
          index < CONTENT_SETTINGS_NUM_TYPES);
   last_selected_page_.SetValue(index);
 }
 
 void ContentSettingsWindowGtk::OnWindowDestroy(GtkWidget* widget) {
   settings_window = NULL;
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }