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

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

Issue 10808006: Move printing.* prefs from local state to profile (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased just in case as the CL is a few days old now plus I got my branches all mixed up a bit. Created 8 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
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 } 97 }
98 98
99 ChromeURLRequestContext* extensions_request_context() const { 99 ChromeURLRequestContext* extensions_request_context() const {
100 return extensions_request_context_.get(); 100 return extensions_request_context_.get();
101 } 101 }
102 102
103 BooleanPrefMember* safe_browsing_enabled() const { 103 BooleanPrefMember* safe_browsing_enabled() const {
104 return &safe_browsing_enabled_; 104 return &safe_browsing_enabled_;
105 } 105 }
106 106
107 BooleanPrefMember* printing_enabled() const {
108 return &printing_enabled_;
109 }
110
107 net::TransportSecurityState* transport_security_state() const { 111 net::TransportSecurityState* transport_security_state() const {
108 return transport_security_state_.get(); 112 return transport_security_state_.get();
109 } 113 }
110 114
111 chrome_browser_net::HttpServerPropertiesManager* 115 chrome_browser_net::HttpServerPropertiesManager*
112 http_server_properties_manager() const; 116 http_server_properties_manager() const;
113 117
114 bool is_incognito() const { 118 bool is_incognito() const {
115 return is_incognito_; 119 return is_incognito_;
116 } 120 }
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 // Tracks whether or not we've been lazily initialized. 307 // Tracks whether or not we've been lazily initialized.
304 mutable bool initialized_; 308 mutable bool initialized_;
305 309
306 // Data from the UI thread from the Profile, used to initialize ProfileIOData. 310 // Data from the UI thread from the Profile, used to initialize ProfileIOData.
307 // Deleted after lazy initialization. 311 // Deleted after lazy initialization.
308 mutable scoped_ptr<ProfileParams> profile_params_; 312 mutable scoped_ptr<ProfileParams> profile_params_;
309 313
310 // Member variables which are pointed to by the various context objects. 314 // Member variables which are pointed to by the various context objects.
311 mutable BooleanPrefMember enable_referrers_; 315 mutable BooleanPrefMember enable_referrers_;
312 mutable BooleanPrefMember safe_browsing_enabled_; 316 mutable BooleanPrefMember safe_browsing_enabled_;
317 mutable BooleanPrefMember printing_enabled_;
313 // TODO(marja): Remove session_startup_pref_ if no longer needed. 318 // TODO(marja): Remove session_startup_pref_ if no longer needed.
314 mutable IntegerPrefMember session_startup_pref_; 319 mutable IntegerPrefMember session_startup_pref_;
315 320
316 // The state of metrics reporting in the browser that this profile runs on. 321 // The state of metrics reporting in the browser that this profile runs on.
317 // Unfortunately, since ChromeOS has a separate representation of this state, 322 // Unfortunately, since ChromeOS has a separate representation of this state,
318 // we need to make one available based on the platform. 323 // we need to make one available based on the platform.
319 #if defined(OS_CHROMEOS) 324 #if defined(OS_CHROMEOS)
320 bool enable_metrics_; 325 bool enable_metrics_;
321 #else 326 #else
322 BooleanPrefMember enable_metrics_; 327 BooleanPrefMember enable_metrics_;
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 366
362 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 367 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
363 bool initialized_on_UI_thread_; 368 bool initialized_on_UI_thread_;
364 369
365 bool is_incognito_; 370 bool is_incognito_;
366 371
367 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 372 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
368 }; 373 };
369 374
370 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 375 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698