Add cookie behavior combobox.

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 "app/l10n_util.h"
 #include "base/basictypes.h"
 #include "chrome/browser/browser_process.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/profile.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/common/gtk_util.h"
 #include "chrome/common/pref_member.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
+#include "net/base/cookie_policy.h"
 
 namespace {
 
 // The pixel width we wrap labels at.
 // TODO(evanm): make the labels wrap at the appropriate width.
 const int kWrapWidth = 475;
 
 GtkWidget* CreateWrappedLabel(int string_id) {
   GtkWidget* label = gtk_label_new(
       l10n_util::GetStringUTF8(string_id).c_str());
@@ skipping 84 matching lines @@
   static void OnEnableLinkDoctorChange(GtkWidget* widget,
                                        PrivacySection* options_window);
   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);
 
   // 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_;
   GtkWidget* reporting_enabled_checkbox_;
+  GtkWidget* cookie_behavior_combobox_;
 
   // Preferences for this section:
   BooleanPrefMember alternate_error_pages_;
   BooleanPrefMember use_suggest_;
   BooleanPrefMember dns_prefetch_enabled_;
   BooleanPrefMember safe_browsing_;
   BooleanPrefMember enable_metrics_recording_;
   IntegerPrefMember cookie_behavior_;
 
   // Flag to ignore gtk callbacks while we are loading prefs, to avoid
@@ skipping 44 matching lines @@
   g_signal_connect(enable_safe_browsing_checkbox_, "clicked",
                    G_CALLBACK(OnSafeBrowsingChange), this);
 
   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);
 
-  // TODO(mattm): cookie combobox and button
+  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);
+
+  GtkWidget* cookie_controls = gtk_util::CreateLabeledControlsGroup(
+      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"),
                      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,
@@ skipping 77 matching lines @@
       enabled ?
       L"Options_MetricsReportingCheckbox_Enable" :
       L"Options_MetricsReportingCheckbox_Disable",
       privacy_section->profile()->GetPrefs());
   // TODO(mattm): ResolveMetricsReportingEnabled?
   // TODO(mattm): show browser must be restarted message?
   privacy_section->enable_metrics_recording_.SetValue(enabled);
   GoogleUpdateSettings::SetCollectStatsConsent(enabled);
 }
 
+// static
+void PrivacySection::OnCookieBehaviorChanged(GtkComboBox* combo_box,
+                                             PrivacySection* privacy_section) {
+  if (privacy_section->initializing_)
+    return;
+  net::CookiePolicy::Type cookie_policy =
+      net::CookiePolicy::FromInt(gtk_combo_box_get_active(combo_box));
+  const wchar_t* kUserMetrics[] = {
+      L"Options_AllowAllCookies",
+      L"Options_BlockThirdPartyCookies",
+      L"Options_BlockAllCookies"
+  };
+  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);
+}
+
 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());
   }
   if (!pref_name || *pref_name == prefs::kDnsPrefetchingEnabled) {
     bool enabled = dns_prefetch_enabled_.GetValue();
     gtk_toggle_button_set_active(
         GTK_TOGGLE_BUTTON(enable_dns_prefetching_checkbox_), enabled);
     chrome_browser_net::EnableDnsPrefetch(enabled);
   }
   if (!pref_name || *pref_name == prefs::kSafeBrowsingEnabled) {
     gtk_toggle_button_set_active(
         GTK_TOGGLE_BUTTON(enable_safe_browsing_checkbox_),
         safe_browsing_.GetValue());
   }
   if (!pref_name || *pref_name == prefs::kMetricsReportingEnabled) {
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(reporting_enabled_checkbox_),
                                  enable_metrics_recording_.GetValue());
     // TODO(mattm): ResolveMetricsReportingEnabled()?
   }
   if (!pref_name || *pref_name == prefs::kCookieBehavior) {
-    // TODO(mattm): set cookie combobox state
+    gtk_combo_box_set_active(
+        GTK_COMBO_BOX(cookie_behavior_combobox_),
+        net::CookiePolicy::FromInt(cookie_behavior_.GetValue()));
   }
   initializing_ = false;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // SecuritySection
 
 class SecuritySection : public OptionsPageBase {
  public:
   explicit SecuritySection(Profile* profile);
@@ skipping 77 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();
 }