summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk/options/content_page_gtk.cc
diff options
context:
space:
mode:
authorerg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-10 18:58:54 +0000
committererg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-10 18:58:54 +0000
commitd8e7a54e37ed11d60f7d8dd8f5d5732cffe94b95 (patch)
tree8912ce2d6acc77fda0119d872283268390eeef15 /chrome/browser/gtk/options/content_page_gtk.cc
parent13044cdc2b1e8fb304af65a7913c083f52c623bc (diff)
downloadchromium_src-d8e7a54e37ed11d60f7d8dd8f5d5732cffe94b95.zip
chromium_src-d8e7a54e37ed11d60f7d8dd8f5d5732cffe94b95.tar.gz
chromium_src-d8e7a54e37ed11d60f7d8dd8f5d5732cffe94b95.tar.bz2
GTK: Implements the content settings window and the minor changes to the options dialog.
The "Exceptions" dialogs are still not implemented; they're the next step but this changelist is already getting pretty huge. BUG=35178 TEST=none Review URL: http://codereview.chromium.org/602005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38642 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/options/content_page_gtk.cc')
-rw-r--r--chrome/browser/gtk/options/content_page_gtk.cc18
1 files changed, 0 insertions, 18 deletions
diff --git a/chrome/browser/gtk/options/content_page_gtk.cc b/chrome/browser/gtk/options/content_page_gtk.cc
index b577462..e1aa8be 100644
--- a/chrome/browser/gtk/options/content_page_gtk.cc
+++ b/chrome/browser/gtk/options/content_page_gtk.cc
@@ -11,7 +11,6 @@
#include "chrome/browser/browser_list.h"
#include "chrome/browser/browser_window.h"
#include "chrome/browser/defaults.h"
-#include "chrome/browser/gtk/clear_browsing_data_dialog_gtk.h"
#include "chrome/browser/gtk/gtk_chrome_link_button.h"
#include "chrome/browser/gtk/gtk_theme_provider.h"
#include "chrome/browser/gtk/import_dialog_gtk.h"
@@ -238,15 +237,6 @@ GtkWidget* ContentPageGtk::InitBrowsingDataGroup() {
G_CALLBACK(OnImportButtonClicked), this);
gtk_box_pack_start(GTK_BOX(button_hbox), import_button, FALSE, FALSE, 0);
- // Clear data button.
- // TODO(pkasting): This should move to the advanced settings page (see
- // Windows).
- GtkWidget* clear_data_button = gtk_button_new_with_label(
- l10n_util::GetStringUTF8(IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON).c_str());
- g_signal_connect(clear_data_button, "clicked",
- G_CALLBACK(OnClearBrowsingDataButtonClicked), this);
- gtk_box_pack_start(GTK_BOX(button_hbox), clear_data_button, FALSE, FALSE, 0);
-
return vbox;
}
@@ -394,14 +384,6 @@ void ContentPageGtk::OnImportButtonClicked(GtkButton* widget,
}
// static
-void ContentPageGtk::OnClearBrowsingDataButtonClicked(GtkButton* widget,
- ContentPageGtk* page) {
- ClearBrowsingDataDialogGtk::Show(
- GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(widget))),
- page->profile());
-}
-
-// static
void ContentPageGtk::OnGtkThemeButtonClicked(GtkButton* widget,
ContentPageGtk* page) {
page->UserMetricsRecordAction("Options_GtkThemeSet",