Changes to support new cookie policy....

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"
@@ skipping 18 matching lines @@
 #include "chrome/browser/renderer_host/resource_dispatcher_host.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"
 #include "chrome/common/process_watcher.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
-#include "net/base/cookie_policy.h"
 
 namespace {
 
 // Command used to configure GNOME proxy settings. The command was renamed
 // in January 2009, so both are used to work on both old and new systems.
 const char* kOldGNOMEProxyConfigCommand[] = {"gnome-network-preferences", NULL};
 const char* kGNOMEProxyConfigCommand[] = {"gnome-network-properties", NULL};
 // KDE3 and KDE4 are only slightly different, but incompatible. Go figure.
 const char* kKDE3ProxyConfigCommand[] = {"kcmshell", "proxy", NULL};
 const char* kKDE4ProxyConfigCommand[] = {"kcmshell4", "proxy", NULL};
@@ skipping 475 matching lines @@
   GtkWidget* reporting_enabled_checkbox_;
 #endif
   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
   // then turning around and saving them again.
   bool pref_changing_;
 
   scoped_ptr<AccessibleWidgetHelper> accessible_widget_helper_;
 
   DISALLOW_COPY_AND_ASSIGN(PrivacySection);
 };
 
@@ skipping 113 matching lines @@
   // 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,
                                  g_browser_process->local_state(), this);
-  cookie_behavior_.Init(prefs::kCookieBehavior, profile->GetPrefs(), this);
 
   NotifyPrefChanged(NULL);
 }
 
 // static
 void PrivacySection::OnLearnMoreLinkClicked(GtkButton *button,
                                             PrivacySection* privacy_section) {
   BrowserList::GetLastActive()->
       OpenURL(GURL(l10n_util::GetStringUTF8(IDS_LEARN_MORE_PRIVACY_URL)),
               GURL(), NEW_WINDOW, PageTransition::LINK);
@@ skipping 81 matching lines @@
     privacy_section->ShowRestartMessageBox();
   g_signal_handlers_unblock_by_func(widget,
                                     reinterpret_cast<gpointer>(OnLoggingChange),
                                     privacy_section);
   privacy_section->enable_metrics_recording_.SetValue(enabled);
 }
 
 // static
 void PrivacySection::OnCookieBehaviorChanged(GtkComboBox* combo_box,
                                              PrivacySection* privacy_section) {
-  if (privacy_section->pref_changing_)
-    return;
-  net::CookiePolicy::Type cookie_policy =
-      net::CookiePolicy::FromInt(gtk_combo_box_get_active(combo_box));
-  const char* kUserMetrics[] = {
-      "Options_AllowAllCookies",
-      "Options_BlockThirdPartyCookies",
-      "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);
+  // TODO(darin): Remove everything else related to this setter.
 }
 
 // static
 void PrivacySection::OnShowCookiesButtonClicked(
     GtkButton *button, PrivacySection* privacy_section) {
   privacy_section->UserMetricsRecordAction("Options_ShowCookies", NULL);
   CookiesView::Show(privacy_section->profile(),
                     new BrowsingDataLocalStorageHelper(
                         privacy_section->profile()));
 }
@@ skipping 20 matching lines @@
         GTK_TOGGLE_BUTTON(enable_safe_browsing_checkbox_),
         safe_browsing_.GetValue());
   }
 #if defined(GOOGLE_CHROME_BUILD)
   if (!pref_name || *pref_name == prefs::kMetricsReportingEnabled) {
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(reporting_enabled_checkbox_),
                                  enable_metrics_recording_.GetValue());
     ResolveMetricsReportingEnabled();
   }
 #endif
-  if (!pref_name || *pref_name == prefs::kCookieBehavior) {
-    gtk_combo_box_set_active(
-        GTK_COMBO_BOX(cookie_behavior_combobox_),
-        net::CookiePolicy::FromInt(cookie_behavior_.GetValue()));
-  }
   pref_changing_ = false;
 }
 
 void PrivacySection::ResolveMetricsReportingEnabled() {
 #if defined(GOOGLE_CHROME_BUILD)
   bool enabled = gtk_toggle_button_get_active(
       GTK_TOGGLE_BUTTON(reporting_enabled_checkbox_));
 
   enabled = OptionsUtil::ResolveMetricsReportingEnabled(enabled);
 
@@ skipping 311 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();
 }