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

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: Retired PrintPreviewUnitTestBase class. 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
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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 } 96 }
97 97
98 ChromeURLRequestContext* extensions_request_context() const { 98 ChromeURLRequestContext* extensions_request_context() const {
99 return extensions_request_context_.get(); 99 return extensions_request_context_.get();
100 } 100 }
101 101
102 BooleanPrefMember* safe_browsing_enabled() const { 102 BooleanPrefMember* safe_browsing_enabled() const {
103 return &safe_browsing_enabled_; 103 return &safe_browsing_enabled_;
104 } 104 }
105 105
106 BooleanPrefMember* printing_enabled() const {
107 return &printing_enabled_;
108 }
109
106 net::TransportSecurityState* transport_security_state() const { 110 net::TransportSecurityState* transport_security_state() const {
107 return transport_security_state_.get(); 111 return transport_security_state_.get();
108 } 112 }
109 113
110 chrome_browser_net::HttpServerPropertiesManager* 114 chrome_browser_net::HttpServerPropertiesManager*
111 http_server_properties_manager() const; 115 http_server_properties_manager() const;
112 116
113 bool is_incognito() const { 117 bool is_incognito() const {
114 return is_incognito_; 118 return is_incognito_;
115 } 119 }
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 // Tracks whether or not we've been lazily initialized. 300 // Tracks whether or not we've been lazily initialized.
297 mutable bool initialized_; 301 mutable bool initialized_;
298 302
299 // Data from the UI thread from the Profile, used to initialize ProfileIOData. 303 // Data from the UI thread from the Profile, used to initialize ProfileIOData.
300 // Deleted after lazy initialization. 304 // Deleted after lazy initialization.
301 mutable scoped_ptr<ProfileParams> profile_params_; 305 mutable scoped_ptr<ProfileParams> profile_params_;
302 306
303 // Member variables which are pointed to by the various context objects. 307 // Member variables which are pointed to by the various context objects.
304 mutable BooleanPrefMember enable_referrers_; 308 mutable BooleanPrefMember enable_referrers_;
305 mutable BooleanPrefMember safe_browsing_enabled_; 309 mutable BooleanPrefMember safe_browsing_enabled_;
310 mutable BooleanPrefMember printing_enabled_;
306 // TODO(marja): Remove session_startup_pref_ if no longer needed. 311 // TODO(marja): Remove session_startup_pref_ if no longer needed.
307 mutable IntegerPrefMember session_startup_pref_; 312 mutable IntegerPrefMember session_startup_pref_;
308 313
309 // The state of metrics reporting in the browser that this profile runs on. 314 // The state of metrics reporting in the browser that this profile runs on.
310 // Unfortunately, since ChromeOS has a separate representation of this state, 315 // Unfortunately, since ChromeOS has a separate representation of this state,
311 // we need to make one available based on the platform. 316 // we need to make one available based on the platform.
312 #if defined(OS_CHROMEOS) 317 #if defined(OS_CHROMEOS)
313 bool enable_metrics_; 318 bool enable_metrics_;
314 #else 319 #else
315 BooleanPrefMember enable_metrics_; 320 BooleanPrefMember enable_metrics_;
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 359
355 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 360 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
356 bool initialized_on_UI_thread_; 361 bool initialized_on_UI_thread_;
357 362
358 bool is_incognito_; 363 bool is_incognito_;
359 364
360 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 365 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
361 }; 366 };
362 367
363 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 368 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698