diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 17:31:27 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 17:31:27 +0000 |
| commit | b12350654488c041c407d7aefd4d016e97c3e204 (patch) | |
| tree | 28fe0a78bae8320e8051e3d469d082cf564c0dd4 /chrome/browser/gtk/options | |
| parent | 75393a5c79f92b579ff9535f6a22ee88f03365f5 (diff) | |
| download | chromium_src-b12350654488c041c407d7aefd4d016e97c3e204.zip chromium_src-b12350654488c041c407d7aefd4d016e97c3e204.tar.gz chromium_src-b12350654488c041c407d7aefd4d016e97c3e204.tar.bz2 | |
Add Geolocation to the content types. This adds several special case guards so we can still build & run whilst the full implementation is being worked on (in parallel)
(Some code taken from http://codereview.chromium.org/650180)
BUG=11246
TEST=Built & ran on all three platforms. Used geolocation & open content setting dialog.
Review URL: http://codereview.chromium.org/1241006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42633 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/options')
| -rw-r--r-- | chrome/browser/gtk/options/content_exceptions_window_gtk.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/gtk/options/content_settings_window_gtk.cc | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/gtk/options/content_exceptions_window_gtk.cc b/chrome/browser/gtk/options/content_exceptions_window_gtk.cc index 7cf9630..cd20544 100644 --- a/chrome/browser/gtk/options/content_exceptions_window_gtk.cc +++ b/chrome/browser/gtk/options/content_exceptions_window_gtk.cc @@ -42,6 +42,8 @@ void ContentExceptionsWindowGtk::ShowExceptionsWindow( ContentSettingsType type) { DCHECK(map); DCHECK(type < CONTENT_SETTINGS_NUM_TYPES); + // TODO(joth): remove once fully implemented. + DCHECK(type != CONTENT_SETTINGS_TYPE_GEOLOCATION); if (!instances[type]) { // Create the options window. diff --git a/chrome/browser/gtk/options/content_settings_window_gtk.cc b/chrome/browser/gtk/options/content_settings_window_gtk.cc index 7e50a7c..82737389 100644 --- a/chrome/browser/gtk/options/content_settings_window_gtk.cc +++ b/chrome/browser/gtk/options/content_settings_window_gtk.cc @@ -114,8 +114,9 @@ ContentSettingsWindowGtk::ContentSettingsWindowGtk(GtkWindow* parent, 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 |