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

Side by Side Diff: chrome/browser/profiles/profile_io_data.h

Issue 9965012: Honor session content settings even if "continue where I left off" is selected. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Only honor the "clear on exit", not session-only cookies. Created 8 years, 8 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 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 5 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
6 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 6 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 mutable bool initialized_; 257 mutable bool initialized_;
258 258
259 // Data from the UI thread from the Profile, used to initialize ProfileIOData. 259 // Data from the UI thread from the Profile, used to initialize ProfileIOData.
260 // Deleted after lazy initialization. 260 // Deleted after lazy initialization.
261 mutable scoped_ptr<ProfileParams> profile_params_; 261 mutable scoped_ptr<ProfileParams> profile_params_;
262 262
263 // Member variables which are pointed to by the various context objects. 263 // Member variables which are pointed to by the various context objects.
264 mutable BooleanPrefMember enable_referrers_; 264 mutable BooleanPrefMember enable_referrers_;
265 mutable BooleanPrefMember clear_local_state_on_exit_; 265 mutable BooleanPrefMember clear_local_state_on_exit_;
266 mutable BooleanPrefMember safe_browsing_enabled_; 266 mutable BooleanPrefMember safe_browsing_enabled_;
267 // TODO(marja): Remove session_startup_pref_ if no longer needed.
267 mutable IntegerPrefMember session_startup_pref_; 268 mutable IntegerPrefMember session_startup_pref_;
268 269
269 // Pointed to by NetworkDelegate. 270 // Pointed to by NetworkDelegate.
270 mutable scoped_ptr<policy::URLBlacklistManager> url_blacklist_manager_; 271 mutable scoped_ptr<policy::URLBlacklistManager> url_blacklist_manager_;
271 272
272 // Pointed to by URLRequestContext. 273 // Pointed to by URLRequestContext.
273 mutable scoped_ptr<ChromeURLDataManagerBackend> 274 mutable scoped_ptr<ChromeURLDataManagerBackend>
274 chrome_url_data_manager_backend_; 275 chrome_url_data_manager_backend_;
275 mutable scoped_ptr<net::ServerBoundCertService> server_bound_cert_service_; 276 mutable scoped_ptr<net::ServerBoundCertService> server_bound_cert_service_;
276 mutable scoped_ptr<net::NetworkDelegate> network_delegate_; 277 mutable scoped_ptr<net::NetworkDelegate> network_delegate_;
(...skipping 26 matching lines...) Expand all
303 // One AppRequestContext per isolated app. 304 // One AppRequestContext per isolated app.
304 mutable AppRequestContextMap app_request_context_map_; 305 mutable AppRequestContextMap app_request_context_map_;
305 306
306 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 307 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
307 bool initialized_on_UI_thread_; 308 bool initialized_on_UI_thread_;
308 309
309 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 310 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
310 }; 311 };
311 312
312 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 313 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/resources/options2/browser_options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698