Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 <map> | |
|
jkarlin
2014/06/26 16:28:52
why add this?
Bence
2014/06/26 20:02:06
git cl lint was complaining. Should I ignore it?
| |
| 8 #include <string> | 9 #include <string> |
| 9 | 10 |
| 10 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
| 11 #include "base/callback_forward.h" | 12 #include "base/callback_forward.h" |
| 12 #include "base/files/file_path.h" | 13 #include "base/files/file_path.h" |
| 13 #include "base/memory/ref_counted.h" | 14 #include "base/memory/ref_counted.h" |
| 14 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
| 15 #include "base/memory/weak_ptr.h" | 16 #include "base/memory/weak_ptr.h" |
| 16 #include "base/prefs/pref_member.h" | 17 #include "base/prefs/pref_member.h" |
| 17 #include "base/synchronization/lock.h" | 18 #include "base/synchronization/lock.h" |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 178 } | 179 } |
| 179 | 180 |
| 180 BooleanPrefMember* sync_disabled() const { | 181 BooleanPrefMember* sync_disabled() const { |
| 181 return &sync_disabled_; | 182 return &sync_disabled_; |
| 182 } | 183 } |
| 183 | 184 |
| 184 BooleanPrefMember* signin_allowed() const { | 185 BooleanPrefMember* signin_allowed() const { |
| 185 return &signin_allowed_; | 186 return &signin_allowed_; |
| 186 } | 187 } |
| 187 | 188 |
| 189 // TODO(bnc): remove per https://crbug.com/334602. | |
| 188 BooleanPrefMember* network_prediction_enabled() const { | 190 BooleanPrefMember* network_prediction_enabled() const { |
| 189 return &network_prediction_enabled_; | 191 return &network_prediction_enabled_; |
| 190 } | 192 } |
| 191 | 193 |
| 194 IntegerPrefMember* allow_network_prediction() const { | |
| 195 return &allow_network_prediction_; | |
| 196 } | |
| 197 | |
| 192 content::ResourceContext::SaltCallback GetMediaDeviceIDSalt() const; | 198 content::ResourceContext::SaltCallback GetMediaDeviceIDSalt() const; |
| 193 | 199 |
| 194 DevToolsNetworkController* network_controller() const { | 200 DevToolsNetworkController* network_controller() const { |
| 195 return network_controller_.get(); | 201 return network_controller_.get(); |
| 196 } | 202 } |
| 197 | 203 |
| 198 net::TransportSecurityState* transport_security_state() const { | 204 net::TransportSecurityState* transport_security_state() const { |
| 199 return transport_security_state_.get(); | 205 return transport_security_state_.get(); |
| 200 } | 206 } |
| 201 | 207 |
| (...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 526 // Member variables which are pointed to by the various context objects. | 532 // Member variables which are pointed to by the various context objects. |
| 527 mutable BooleanPrefMember enable_referrers_; | 533 mutable BooleanPrefMember enable_referrers_; |
| 528 mutable BooleanPrefMember enable_do_not_track_; | 534 mutable BooleanPrefMember enable_do_not_track_; |
| 529 mutable BooleanPrefMember force_safesearch_; | 535 mutable BooleanPrefMember force_safesearch_; |
| 530 mutable BooleanPrefMember safe_browsing_enabled_; | 536 mutable BooleanPrefMember safe_browsing_enabled_; |
| 531 mutable BooleanPrefMember data_reduction_proxy_enabled_; | 537 mutable BooleanPrefMember data_reduction_proxy_enabled_; |
| 532 mutable BooleanPrefMember printing_enabled_; | 538 mutable BooleanPrefMember printing_enabled_; |
| 533 mutable BooleanPrefMember sync_disabled_; | 539 mutable BooleanPrefMember sync_disabled_; |
| 534 mutable BooleanPrefMember signin_allowed_; | 540 mutable BooleanPrefMember signin_allowed_; |
| 535 mutable BooleanPrefMember network_prediction_enabled_; | 541 mutable BooleanPrefMember network_prediction_enabled_; |
| 542 mutable IntegerPrefMember allow_network_prediction_; | |
| 536 // TODO(marja): Remove session_startup_pref_ if no longer needed. | 543 // TODO(marja): Remove session_startup_pref_ if no longer needed. |
| 537 mutable IntegerPrefMember session_startup_pref_; | 544 mutable IntegerPrefMember session_startup_pref_; |
| 538 mutable BooleanPrefMember quick_check_enabled_; | 545 mutable BooleanPrefMember quick_check_enabled_; |
| 539 mutable IntegerPrefMember incognito_availibility_pref_; | 546 mutable IntegerPrefMember incognito_availibility_pref_; |
| 540 | 547 |
| 541 // The state of metrics reporting in the browser that this profile runs on. | 548 // The state of metrics reporting in the browser that this profile runs on. |
| 542 // Unfortunately, since ChromeOS has a separate representation of this state, | 549 // Unfortunately, since ChromeOS has a separate representation of this state, |
| 543 // we need to make one available based on the platform. | 550 // we need to make one available based on the platform. |
| 544 #if defined(OS_CHROMEOS) | 551 #if defined(OS_CHROMEOS) |
| 545 bool enable_metrics_; | 552 bool enable_metrics_; |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 597 | 604 |
| 598 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. | 605 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. |
| 599 bool initialized_on_UI_thread_; | 606 bool initialized_on_UI_thread_; |
| 600 | 607 |
| 601 const Profile::ProfileType profile_type_; | 608 const Profile::ProfileType profile_type_; |
| 602 | 609 |
| 603 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); | 610 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); |
| 604 }; | 611 }; |
| 605 | 612 |
| 606 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ | 613 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ |
| OLD | NEW |