Gtk cookie manager part 1....

chrome/browser/gtk/options/advanced_contents_gtk.cc

 // Copyright (c) 2009 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/advanced_contents_gtk.h"
 
 #include <sys/types.h>
 #include <sys/wait.h>
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
 #include "base/linux_util.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/fonts_languages_window.h"
 #include "chrome/browser/gtk/gtk_chrome_link_button.h"
+#include "chrome/browser/gtk/options/cookies_view.h"
 #include "chrome/browser/gtk/options/options_layout_gtk.h"
 #include "chrome/browser/net/dns_global.h"
 #include "chrome/browser/options_page_base.h"
 #include "chrome/browser/options_util.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/gtk_util.h"
 #include "chrome/common/pref_member.h"
 #include "chrome/common/pref_names.h"
@@ skipping 323 matching lines @@
   static void OnEnableSuggestChange(GtkWidget* widget,
                                     PrivacySection* options_window);
   static void OnDNSPrefetchingChange(GtkWidget* widget,
                                      PrivacySection* options_window);
   static void OnSafeBrowsingChange(GtkWidget* widget,
                                    PrivacySection* options_window);
   static void OnLoggingChange(GtkWidget* widget,
                               PrivacySection* options_window);
   static void OnCookieBehaviorChanged(GtkComboBox* combo_box,
                                       PrivacySection* privacy_section);
+  static void OnShowCookiesButtonClicked(GtkButton *button,
+                                         PrivacySection* privacy_section);
 
   // The widget containing the options for this section.
   GtkWidget* page_;
 
   // The widgets for the privacy options.
   GtkWidget* enable_link_doctor_checkbox_;
   GtkWidget* enable_suggest_checkbox_;
   GtkWidget* enable_dns_prefetching_checkbox_;
   GtkWidget* enable_safe_browsing_checkbox_;
 #if defined(GOOGLE_CHROME_BUILD)
@@ skipping 68 matching lines @@
 
 #if defined(GOOGLE_CHROME_BUILD)
   reporting_enabled_checkbox_ = CreateCheckButtonWithWrappedLabel(
       IDS_OPTIONS_ENABLE_LOGGING);
   gtk_box_pack_start(GTK_BOX(page_), reporting_enabled_checkbox_,
                      FALSE, FALSE, 0);
   g_signal_connect(reporting_enabled_checkbox_, "clicked",
                    G_CALLBACK(OnLoggingChange), this);
 #endif
 
+  GtkWidget* cookie_description_label = gtk_label_new(
+      l10n_util::GetStringUTF8(IDS_OPTIONS_COOKIES_ACCEPT_LABEL).c_str());
+  gtk_misc_set_alignment(GTK_MISC(cookie_description_label), 0, 0);
+  gtk_box_pack_start(GTK_BOX(page_), cookie_description_label, FALSE, FALSE, 0);
+
+  GtkWidget* cookie_controls = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
+  gtk_box_pack_start(GTK_BOX(page_),
+                     OptionsLayoutBuilderGtk::IndentWidget(cookie_controls),
+                     FALSE, FALSE, 0);
+
   cookie_behavior_combobox_ = gtk_combo_box_new_text();
   gtk_combo_box_append_text(
       GTK_COMBO_BOX(cookie_behavior_combobox_),
       l10n_util::GetStringUTF8(IDS_OPTIONS_COOKIES_ACCEPT_ALL_COOKIES).c_str());
   gtk_combo_box_append_text(
       GTK_COMBO_BOX(cookie_behavior_combobox_),
       l10n_util::GetStringUTF8(
           IDS_OPTIONS_COOKIES_RESTRICT_THIRD_PARTY_COOKIES).c_str());
   gtk_combo_box_append_text(
       GTK_COMBO_BOX(cookie_behavior_combobox_),
       l10n_util::GetStringUTF8(IDS_OPTIONS_COOKIES_BLOCK_ALL_COOKIES).c_str());
   g_signal_connect(G_OBJECT(cookie_behavior_combobox_), "changed",
                    G_CALLBACK(OnCookieBehaviorChanged), this);
+  gtk_box_pack_start(GTK_BOX(cookie_controls), cookie_behavior_combobox_,
+                     FALSE, FALSE, 0);
 
-  GtkWidget* cookie_controls = gtk_util::CreateLabeledControlsGroup(NULL,
-      l10n_util::GetStringUTF8(IDS_OPTIONS_COOKIES_ACCEPT_LABEL).c_str(),
-      cookie_behavior_combobox_,
-      NULL);
-  gtk_box_pack_start(GTK_BOX(page_), cookie_controls, FALSE, FALSE, 0);
-
-  // TODO(mattm): show cookies button
-  gtk_box_pack_start(GTK_BOX(page_),
-                     gtk_label_new("TODO rest of the privacy options"),
+  GtkWidget* show_cookies_button = gtk_button_new_with_label(
+      l10n_util::GetStringUTF8(IDS_OPTIONS_COOKIES_SHOWCOOKIES).c_str());
+  g_signal_connect(show_cookies_button, "clicked",
+                   G_CALLBACK(OnShowCookiesButtonClicked), this);
+  // Stick it in an hbox so it doesn't expand to the whole width.
+  GtkWidget* button_hbox = gtk_hbox_new(FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(button_hbox), show_cookies_button,
                      FALSE, FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(cookie_controls), button_hbox, FALSE, FALSE, 0);
 
   // Init member prefs so we can update the controls if prefs change.
   alternate_error_pages_.Init(prefs::kAlternateErrorPagesEnabled,
                               profile->GetPrefs(), this);
   use_suggest_.Init(prefs::kSearchSuggestEnabled,
                     profile->GetPrefs(), this);
   dns_prefetch_enabled_.Init(prefs::kDnsPrefetchingEnabled,
                              profile->GetPrefs(), this);
   safe_browsing_.Init(prefs::kSafeBrowsingEnabled, profile->GetPrefs(), this);
   enable_metrics_recording_.Init(prefs::kMetricsReportingEnabled,
@@ skipping 112 matching lines @@
   if (cookie_policy < 0 ||
       static_cast<size_t>(cookie_policy) >= arraysize(kUserMetrics)) {
     NOTREACHED();
     return;
   }
   privacy_section->UserMetricsRecordAction(
       kUserMetrics[cookie_policy], privacy_section->profile()->GetPrefs());
   privacy_section->cookie_behavior_.SetValue(cookie_policy);
 }
 
+// static
+void PrivacySection::OnShowCookiesButtonClicked(
+    GtkButton *button, PrivacySection* privacy_section) {
+  privacy_section->UserMetricsRecordAction(L"Options_ShowCookies", NULL);
+  CookiesView::Show(privacy_section->profile());
+}
+
 void PrivacySection::NotifyPrefChanged(const std::wstring* pref_name) {
   initializing_ = true;
   if (!pref_name || *pref_name == prefs::kAlternateErrorPagesEnabled) {
     gtk_toggle_button_set_active(
         GTK_TOGGLE_BUTTON(enable_link_doctor_checkbox_),
         alternate_error_pages_.GetValue());
   }
   if (!pref_name || *pref_name == prefs::kSearchSuggestEnabled) {
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(enable_suggest_checkbox_),
                                  use_suggest_.GetValue());
@@ skipping 201 matching lines @@
       l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT),
       web_content_section_->get_page_widget(), false);
 
   security_section_.reset(new SecuritySection(profile_));
   options_builder.AddOptionGroup(
       l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY),
       security_section_->get_page_widget(), false);
 
   page_ = options_builder.get_page_widget();
 }