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

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

Issue 520613004: Remove network_prediction_enabled from profile_io_data. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
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 <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 } 189 }
190 190
191 BooleanPrefMember* sync_disabled() const { 191 BooleanPrefMember* sync_disabled() const {
192 return &sync_disabled_; 192 return &sync_disabled_;
193 } 193 }
194 194
195 BooleanPrefMember* signin_allowed() const { 195 BooleanPrefMember* signin_allowed() const {
196 return &signin_allowed_; 196 return &signin_allowed_;
197 } 197 }
198 198
199 // TODO(bnc): remove per https://crbug.com/334602.
200 BooleanPrefMember* network_prediction_enabled() const {
201 return &network_prediction_enabled_;
202 }
203
204 IntegerPrefMember* network_prediction_options() const { 199 IntegerPrefMember* network_prediction_options() const {
205 return &network_prediction_options_; 200 return &network_prediction_options_;
206 } 201 }
207 202
208 content::ResourceContext::SaltCallback GetMediaDeviceIDSalt() const; 203 content::ResourceContext::SaltCallback GetMediaDeviceIDSalt() const;
209 204
210 DevToolsNetworkController* network_controller() const { 205 DevToolsNetworkController* network_controller() const {
211 return network_controller_.get(); 206 return network_controller_.get();
212 } 207 }
213 208
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 mutable BooleanPrefMember enable_referrers_; 541 mutable BooleanPrefMember enable_referrers_;
547 mutable BooleanPrefMember enable_do_not_track_; 542 mutable BooleanPrefMember enable_do_not_track_;
548 mutable BooleanPrefMember force_safesearch_; 543 mutable BooleanPrefMember force_safesearch_;
549 mutable BooleanPrefMember safe_browsing_enabled_; 544 mutable BooleanPrefMember safe_browsing_enabled_;
550 #if defined(SPDY_PROXY_AUTH_ORIGIN) 545 #if defined(SPDY_PROXY_AUTH_ORIGIN)
551 mutable BooleanPrefMember data_reduction_proxy_enabled_; 546 mutable BooleanPrefMember data_reduction_proxy_enabled_;
552 #endif 547 #endif
553 mutable BooleanPrefMember printing_enabled_; 548 mutable BooleanPrefMember printing_enabled_;
554 mutable BooleanPrefMember sync_disabled_; 549 mutable BooleanPrefMember sync_disabled_;
555 mutable BooleanPrefMember signin_allowed_; 550 mutable BooleanPrefMember signin_allowed_;
556 mutable BooleanPrefMember network_prediction_enabled_;
557 mutable IntegerPrefMember network_prediction_options_; 551 mutable IntegerPrefMember network_prediction_options_;
558 // TODO(marja): Remove session_startup_pref_ if no longer needed. 552 // TODO(marja): Remove session_startup_pref_ if no longer needed.
559 mutable IntegerPrefMember session_startup_pref_; 553 mutable IntegerPrefMember session_startup_pref_;
560 mutable BooleanPrefMember quick_check_enabled_; 554 mutable BooleanPrefMember quick_check_enabled_;
561 mutable IntegerPrefMember incognito_availibility_pref_; 555 mutable IntegerPrefMember incognito_availibility_pref_;
562 556
563 // The state of metrics reporting in the browser that this profile runs on. 557 // The state of metrics reporting in the browser that this profile runs on.
564 // Unfortunately, since ChromeOS has a separate representation of this state, 558 // Unfortunately, since ChromeOS has a separate representation of this state,
565 // we need to make one available based on the platform. 559 // we need to make one available based on the platform.
566 #if defined(OS_CHROMEOS) 560 #if defined(OS_CHROMEOS)
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 619
626 // TODO(jhawkins): Remove once crbug.com/102004 is fixed. 620 // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
627 bool initialized_on_UI_thread_; 621 bool initialized_on_UI_thread_;
628 622
629 const Profile::ProfileType profile_type_; 623 const Profile::ProfileType profile_type_;
630 624
631 DISALLOW_COPY_AND_ASSIGN(ProfileIOData); 625 DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
632 }; 626 };
633 627
634 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_ 628 #endif // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/profiles/profile_io_data.cc » ('j') | chrome/browser/profiles/profile_io_data.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698