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> | 8 #include <map> |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
526 std::string reverse_autologin_pending_email_; | 526 std::string reverse_autologin_pending_email_; |
527 | 527 |
528 mutable StringListPrefMember one_click_signin_rejected_email_list_; | 528 mutable StringListPrefMember one_click_signin_rejected_email_list_; |
529 | 529 |
530 mutable scoped_refptr<MediaDeviceIDSalt> media_device_id_salt_; | 530 mutable scoped_refptr<MediaDeviceIDSalt> media_device_id_salt_; |
531 | 531 |
532 // Member variables which are pointed to by the various context objects. | 532 // Member variables which are pointed to by the various context objects. |
533 mutable BooleanPrefMember enable_referrers_; | 533 mutable BooleanPrefMember enable_referrers_; |
534 mutable BooleanPrefMember enable_do_not_track_; | 534 mutable BooleanPrefMember enable_do_not_track_; |
535 mutable BooleanPrefMember force_safesearch_; | 535 mutable BooleanPrefMember force_safesearch_; |
536 mutable BooleanPrefMember spdy_proxy_auth_enabled_; | |
bengr
2014/07/16 01:40:09
You shouldn't need both a data_reduction_proxy_ena
megjablon
2014/07/16 23:07:14
This is how we fixed the problem of it being initi
bengr
2014/07/16 23:28:14
Figure out the initialization order and the order
| |
536 mutable BooleanPrefMember safe_browsing_enabled_; | 537 mutable BooleanPrefMember safe_browsing_enabled_; |
537 mutable BooleanPrefMember data_reduction_proxy_enabled_; | 538 mutable BooleanPrefMember data_reduction_proxy_enabled_; |
538 mutable BooleanPrefMember printing_enabled_; | 539 mutable BooleanPrefMember printing_enabled_; |
539 mutable BooleanPrefMember sync_disabled_; | 540 mutable BooleanPrefMember sync_disabled_; |
540 mutable BooleanPrefMember signin_allowed_; | 541 mutable BooleanPrefMember signin_allowed_; |
541 mutable BooleanPrefMember network_prediction_enabled_; | 542 mutable BooleanPrefMember network_prediction_enabled_; |
542 mutable IntegerPrefMember network_prediction_options_; | 543 mutable IntegerPrefMember network_prediction_options_; |
543 // TODO(marja): Remove session_startup_pref_ if no longer needed. | 544 // TODO(marja): Remove session_startup_pref_ if no longer needed. |
544 mutable IntegerPrefMember session_startup_pref_; | 545 mutable IntegerPrefMember session_startup_pref_; |
545 mutable BooleanPrefMember quick_check_enabled_; | 546 mutable BooleanPrefMember quick_check_enabled_; |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
604 | 605 |
605 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. | 606 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. |
606 bool initialized_on_UI_thread_; | 607 bool initialized_on_UI_thread_; |
607 | 608 |
608 const Profile::ProfileType profile_type_; | 609 const Profile::ProfileType profile_type_; |
609 | 610 |
610 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); | 611 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); |
611 }; | 612 }; |
612 | 613 |
613 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ | 614 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ |
OLD | NEW |