diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-29 22:42:48 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-29 22:42:48 +0000 |
| commit | b75858a2c0bdb08b5324e2610d04498aadc9f600 (patch) | |
| tree | c073defc27e3d23cba4720fcd3244dee63a6a0cc /chrome/browser/gtk | |
| parent | ea3d1d84be3d6f97bf50e76511c9e26af6895533 (diff) | |
| download | chromium_src-b75858a2c0bdb08b5324e2610d04498aadc9f600.zip chromium_src-b75858a2c0bdb08b5324e2610d04498aadc9f600.tar.gz chromium_src-b75858a2c0bdb08b5324e2610d04498aadc9f600.tar.bz2 | |
Revert r37535.
There was no LGTM, and there was still open discussion in the code review. See
http://codereview.chromium.org/554119. This was not ready to land.
TBR=pkasting
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/553154
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37556 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk')
| -rw-r--r-- | chrome/browser/gtk/options/advanced_contents_gtk.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/gtk/options/advanced_contents_gtk.cc b/chrome/browser/gtk/options/advanced_contents_gtk.cc index 2f7ed5b..d493a39 100644 --- a/chrome/browser/gtk/options/advanced_contents_gtk.cc +++ b/chrome/browser/gtk/options/advanced_contents_gtk.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// 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. @@ -21,7 +21,6 @@ #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/chrome_cookie_policy.h" #include "chrome/browser/net/dns_global.h" #include "chrome/browser/options_page_base.h" #include "chrome/browser/options_util.h" @@ -36,6 +35,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "net/base/cookie_policy.h" namespace { @@ -754,7 +754,7 @@ void PrivacySection::OnCookieBehaviorChanged(GtkComboBox* combo_box, } privacy_section->UserMetricsRecordAction( kUserMetrics[cookie_policy], privacy_section->profile()->GetPrefs()); - privacy_section->profile()->GetCookiePolicy()->set_type(cookie_policy); + privacy_section->cookie_behavior_.SetValue(cookie_policy); } // static |