| 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 <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 } | 164 } |
| 165 | 165 |
| 166 BooleanPrefMember* sync_disabled() const { | 166 BooleanPrefMember* sync_disabled() const { |
| 167 return &sync_disabled_; | 167 return &sync_disabled_; |
| 168 } | 168 } |
| 169 | 169 |
| 170 BooleanPrefMember* signin_allowed() const { | 170 BooleanPrefMember* signin_allowed() const { |
| 171 return &signin_allowed_; | 171 return &signin_allowed_; |
| 172 } | 172 } |
| 173 | 173 |
| 174 BooleanPrefMember* network_prediction_enabled() const { |
| 175 return &network_prediction_enabled_; |
| 176 } |
| 177 |
| 174 std::string GetMediaDeviceIDSalt() const; | 178 std::string GetMediaDeviceIDSalt() const; |
| 175 | 179 |
| 176 net::TransportSecurityState* transport_security_state() const { | 180 net::TransportSecurityState* transport_security_state() const { |
| 177 return transport_security_state_.get(); | 181 return transport_security_state_.get(); |
| 178 } | 182 } |
| 179 | 183 |
| 180 #if defined(OS_CHROMEOS) | 184 #if defined(OS_CHROMEOS) |
| 181 std::string username_hash() const { | 185 std::string username_hash() const { |
| 182 return username_hash_; | 186 return username_hash_; |
| 183 } | 187 } |
| (...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 475 mutable scoped_ptr<MediaDeviceIDSalt> media_device_id_salt_; | 479 mutable scoped_ptr<MediaDeviceIDSalt> media_device_id_salt_; |
| 476 | 480 |
| 477 // Member variables which are pointed to by the various context objects. | 481 // Member variables which are pointed to by the various context objects. |
| 478 mutable BooleanPrefMember enable_referrers_; | 482 mutable BooleanPrefMember enable_referrers_; |
| 479 mutable BooleanPrefMember enable_do_not_track_; | 483 mutable BooleanPrefMember enable_do_not_track_; |
| 480 mutable BooleanPrefMember force_safesearch_; | 484 mutable BooleanPrefMember force_safesearch_; |
| 481 mutable BooleanPrefMember safe_browsing_enabled_; | 485 mutable BooleanPrefMember safe_browsing_enabled_; |
| 482 mutable BooleanPrefMember printing_enabled_; | 486 mutable BooleanPrefMember printing_enabled_; |
| 483 mutable BooleanPrefMember sync_disabled_; | 487 mutable BooleanPrefMember sync_disabled_; |
| 484 mutable BooleanPrefMember signin_allowed_; | 488 mutable BooleanPrefMember signin_allowed_; |
| 489 mutable BooleanPrefMember network_prediction_enabled_; |
| 485 // TODO(marja): Remove session_startup_pref_ if no longer needed. | 490 // TODO(marja): Remove session_startup_pref_ if no longer needed. |
| 486 mutable IntegerPrefMember session_startup_pref_; | 491 mutable IntegerPrefMember session_startup_pref_; |
| 487 mutable BooleanPrefMember quick_check_enabled_; | 492 mutable BooleanPrefMember quick_check_enabled_; |
| 488 | 493 |
| 489 // The state of metrics reporting in the browser that this profile runs on. | 494 // The state of metrics reporting in the browser that this profile runs on. |
| 490 // Unfortunately, since ChromeOS has a separate representation of this state, | 495 // Unfortunately, since ChromeOS has a separate representation of this state, |
| 491 // we need to make one available based on the platform. | 496 // we need to make one available based on the platform. |
| 492 #if defined(OS_CHROMEOS) | 497 #if defined(OS_CHROMEOS) |
| 493 bool enable_metrics_; | 498 bool enable_metrics_; |
| 494 #else | 499 #else |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 543 | 548 |
| 544 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. | 549 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. |
| 545 bool initialized_on_UI_thread_; | 550 bool initialized_on_UI_thread_; |
| 546 | 551 |
| 547 bool is_incognito_; | 552 bool is_incognito_; |
| 548 | 553 |
| 549 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); | 554 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); |
| 550 }; | 555 }; |
| 551 | 556 |
| 552 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ | 557 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ |
| OLD | NEW |