diff options
| author | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-15 18:43:06 +0000 |
|---|---|---|
| committer | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-15 18:43:06 +0000 |
| commit | 9c8e85f1909ecfed0ac6f4e44c820659990f19c8 (patch) | |
| tree | 6d3ba544d5412c8deaf495b22f3200a1604bdfa0 /chrome/browser | |
| parent | e99aac0dfd7a5fdd4b9d204b2a76a18c04486b7b (diff) | |
| download | chromium_src-9c8e85f1909ecfed0ac6f4e44c820659990f19c8.zip chromium_src-9c8e85f1909ecfed0ac6f4e44c820659990f19c8.tar.gz chromium_src-9c8e85f1909ecfed0ac6f4e44c820659990f19c8.tar.bz2 | |
Reverting 16158.
Review URL: http://codereview.chromium.org/113470
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16163 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/net/chrome_url_request_context.cc | 9 | ||||
| -rw-r--r-- | chrome/browser/views/options/advanced_contents_view.cc | 6 |
2 files changed, 3 insertions, 12 deletions
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc index eb3a0d0..1c18ed4 100644 --- a/chrome/browser/net/chrome_url_request_context.cc +++ b/chrome/browser/net/chrome_url_request_context.cc @@ -142,9 +142,7 @@ ChromeURLRequestContext* ChromeURLRequestContext::CreateOriginal( context->cookie_db_.reset(new SQLitePersistentCookieStore( cookie_store_path.ToWStringHack(), g_browser_process->db_thread()->message_loop())); - context->cookie_store_ = new net::CookieMonster( - context->cookie_policy_.GetType() == - net::CookiePolicy::SESSION_COOKIES ? NULL : context->cookie_db_.get()); + context->cookie_store_ = new net::CookieMonster(context->cookie_db_.get()); } return context; @@ -392,11 +390,6 @@ void ChromeURLRequestContext::OnCookiePolicyChange( DCHECK(MessageLoop::current() == ChromeThread::GetMessageLoop(ChromeThread::IO)); cookie_policy_.SetType(type); - - if (is_off_the_record_ || type == net::CookiePolicy::SESSION_COOKIES) - cookie_store_->SetStore(NULL); - else - cookie_store_->SetStore(cookie_db_.get()); } void ChromeURLRequestContext::OnNewExtensions(ExtensionPaths* new_paths) { diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc index 1d56393..a1ed601 100644 --- a/chrome/browser/views/options/advanced_contents_view.cc +++ b/chrome/browser/views/options/advanced_contents_view.cc @@ -286,15 +286,14 @@ class CookieBehaviorComboModel : public views::ComboBox::Model { // Return the number of items in the combo box. virtual int GetItemCount(views::ComboBox* source) { - return 4; + return 3; } virtual std::wstring GetItemAt(views::ComboBox* source, int index) { const int kStringIDs[] = { IDS_OPTIONS_COOKIES_ACCEPT_ALL_COOKIES, IDS_OPTIONS_COOKIES_RESTRICT_THIRD_PARTY_COOKIES, - IDS_OPTIONS_COOKIES_BLOCK_ALL_COOKIES, - IDS_OPTIONS_COOKIES_SESSION_COOKIES + IDS_OPTIONS_COOKIES_BLOCK_ALL_COOKIES }; if (index >= 0 && index < arraysize(kStringIDs)) return l10n_util::GetString(kStringIDs[index]); @@ -473,7 +472,6 @@ void PrivacySection::ItemChanged(views::ComboBox* sender, const wchar_t* kUserMetrics[] = { L"Options_AllowAllCookies", L"Options_BlockThirdPartyCookies", - L"Options_SessionCookies", L"Options_BlockAllCookies" }; DCHECK(cookie_policy >= 0 && cookie_policy < arraysize(kUserMetrics)); |