Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(213)

Side by Side Diff: content/browser/browser_context.cc

Issue 356713005: Rename ServerBoundCert => ChannelID to reflect the current name (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix cookies_list.js Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/public/browser/browser_context.h" 5 #include "content/public/browser/browser_context.h"
6 6
7 #if !defined(OS_IOS) 7 #if !defined(OS_IOS)
8 #include "content/browser/download/download_manager_impl.h" 8 #include "content/browser/download/download_manager_impl.h"
9 #include "content/browser/fileapi/chrome_blob_storage_context.h" 9 #include "content/browser/fileapi/chrome_blob_storage_context.h"
10 #include "content/browser/indexed_db/indexed_db_context_impl.h" 10 #include "content/browser/indexed_db/indexed_db_context_impl.h"
11 #include "content/browser/loader/resource_dispatcher_host_impl.h" 11 #include "content/browser/loader/resource_dispatcher_host_impl.h"
12 #include "content/browser/storage_partition_impl_map.h" 12 #include "content/browser/storage_partition_impl_map.h"
13 #include "content/common/child_process_host_impl.h" 13 #include "content/common/child_process_host_impl.h"
14 #include "content/public/browser/blob_handle.h" 14 #include "content/public/browser/blob_handle.h"
15 #include "content/public/browser/browser_thread.h" 15 #include "content/public/browser/browser_thread.h"
16 #include "content/public/browser/content_browser_client.h" 16 #include "content/public/browser/content_browser_client.h"
17 #include "content/public/browser/site_instance.h" 17 #include "content/public/browser/site_instance.h"
18 #include "net/cookies/cookie_monster.h" 18 #include "net/cookies/cookie_monster.h"
19 #include "net/cookies/cookie_store.h" 19 #include "net/cookies/cookie_store.h"
20 #include "net/ssl/server_bound_cert_service.h" 20 #include "net/ssl/channel_id_service.h"
21 #include "net/ssl/server_bound_cert_store.h" 21 #include "net/ssl/channel_id_store.h"
22 #include "net/url_request/url_request_context.h" 22 #include "net/url_request/url_request_context.h"
23 #include "net/url_request/url_request_context_getter.h" 23 #include "net/url_request/url_request_context_getter.h"
24 #include "webkit/browser/database/database_tracker.h" 24 #include "webkit/browser/database/database_tracker.h"
25 #include "webkit/browser/fileapi/external_mount_points.h" 25 #include "webkit/browser/fileapi/external_mount_points.h"
26 #endif // !OS_IOS 26 #endif // !OS_IOS
27 27
28 using base::UserDataAdapter; 28 using base::UserDataAdapter;
29 29
30 namespace content { 30 namespace content {
31 31
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 66
67 return partition_map->Get(partition_domain, partition_name, in_memory); 67 return partition_map->Get(partition_domain, partition_name, in_memory);
68 } 68 }
69 69
70 void SaveSessionStateOnIOThread( 70 void SaveSessionStateOnIOThread(
71 const scoped_refptr<net::URLRequestContextGetter>& context_getter, 71 const scoped_refptr<net::URLRequestContextGetter>& context_getter,
72 AppCacheServiceImpl* appcache_service) { 72 AppCacheServiceImpl* appcache_service) {
73 net::URLRequestContext* context = context_getter->GetURLRequestContext(); 73 net::URLRequestContext* context = context_getter->GetURLRequestContext();
74 context->cookie_store()->GetCookieMonster()-> 74 context->cookie_store()->GetCookieMonster()->
75 SetForceKeepSessionState(); 75 SetForceKeepSessionState();
76 context->server_bound_cert_service()->GetCertStore()-> 76 context->channel_id_service()->GetChannelIDStore()->
77 SetForceKeepSessionState(); 77 SetForceKeepSessionState();
78 appcache_service->set_force_keep_session_state(); 78 appcache_service->set_force_keep_session_state();
79 } 79 }
80 80
81 void SaveSessionStateOnIndexedDBThread( 81 void SaveSessionStateOnIndexedDBThread(
82 scoped_refptr<IndexedDBContextImpl> indexed_db_context) { 82 scoped_refptr<IndexedDBContextImpl> indexed_db_context) {
83 indexed_db_context->SetForceKeepSessionState(); 83 indexed_db_context->SetForceKeepSessionState();
84 } 84 }
85 85
86 } // namespace 86 } // namespace
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 #endif // !OS_IOS 260 #endif // !OS_IOS
261 261
262 BrowserContext::~BrowserContext() { 262 BrowserContext::~BrowserContext() {
263 #if !defined(OS_IOS) 263 #if !defined(OS_IOS)
264 if (GetUserData(kDownloadManagerKeyName)) 264 if (GetUserData(kDownloadManagerKeyName))
265 GetDownloadManager(this)->Shutdown(); 265 GetDownloadManager(this)->Shutdown();
266 #endif 266 #endif
267 } 267 }
268 268
269 } // namespace content 269 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698